summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2008-05-22 17:44:11 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2008-05-22 17:44:11 +0000
commit9f31058dbe774d84139c77332a6443151b66f5e6 (patch)
treeeacb097d033f47833e8eb44f54dde10ea43867b4
parent8f07e2055ddda6e3ef9414cd08c849b5c6a6562c (diff)
downloadmana-client-9f31058dbe774d84139c77332a6443151b66f5e6.tar.gz
mana-client-9f31058dbe774d84139c77332a6443151b66f5e6.tar.bz2
mana-client-9f31058dbe774d84139c77332a6443151b66f5e6.tar.xz
mana-client-9f31058dbe774d84139c77332a6443151b66f5e6.zip
Fix compile errors when compiling with GCC 4.3 (patch by rodge)
-rw-r--r--ChangeLog5
-rw-r--r--src/gui/widgets/tab.cpp2
-rw-r--r--src/utils/sha256.cpp1
3 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 236d975d..b44d0185 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-22 Roderic Morris <roderic@ccs.neu.edu>
+
+ * src/gui/widgets/tab.cpp, src/utils/sha256.cpp: Fix compile errors
+ when compiling with GCC 4.3.
+
2008-05-20 Bjørn Lindeijer <bjorn@lindeijer.nl>
* INSTALL: Mention Subversion instead of CVS.
diff --git a/src/gui/widgets/tab.cpp b/src/gui/widgets/tab.cpp
index 4bb85946..990c6a95 100644
--- a/src/gui/widgets/tab.cpp
+++ b/src/gui/widgets/tab.cpp
@@ -21,6 +21,8 @@
* $Id$
*/
+#include <algorithm>
+
#include "tab.h"
#include "tabbedarea.h"
diff --git a/src/utils/sha256.cpp b/src/utils/sha256.cpp
index 0cedcc89..209d4f96 100644
--- a/src/utils/sha256.cpp
+++ b/src/utils/sha256.cpp
@@ -71,6 +71,7 @@
*/
#include "sha256.h"
+#include <memory.h>
#ifdef HAS_STDINT
#include <stdint.h>