summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2008-11-08 16:17:30 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2008-11-08 16:17:30 +0000
commit9311774ad6c1a37f95bb2511251719d74426cbb0 (patch)
tree6a77e0a4484bbfa43e00d31670ef4cc3c824dbf3
parentaf58f011a36fdfda135ca6b71504f30cb561be6b (diff)
downloadmana-9311774ad6c1a37f95bb2511251719d74426cbb0.tar.gz
mana-9311774ad6c1a37f95bb2511251719d74426cbb0.tar.bz2
mana-9311774ad6c1a37f95bb2511251719d74426cbb0.tar.xz
mana-9311774ad6c1a37f95bb2511251719d74426cbb0.zip
Fixed compile error with GCC 4.4 reported by Martin Michlmayr.
-rw-r--r--ChangeLog5
-rw-r--r--src/utils/strprintf.cpp6
2 files changed, 6 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index c95e33ca..6d191f2f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-11-08 Bjørn Lindeijer <bjorn@lindeijer.nl>
+
+ * src/utils/strprintf.cpp: Fixed compile error with GCC 4.4 reported
+ by Martin Michlmayr.
+
2008-11-06 Dennis Friis <peavey@placid.dk>
* src/game.cpp: Do not activate shortcuts if tradewindow is visible.
diff --git a/src/utils/strprintf.cpp b/src/utils/strprintf.cpp
index 352696f1..77a6b235 100644
--- a/src/utils/strprintf.cpp
+++ b/src/utils/strprintf.cpp
@@ -21,10 +21,8 @@
* $Id: strprintf.cpp 3416 2007-08-06 06:20:14Z gmelquio $
*/
-#ifndef _TMW_UTILS_TOSTRING_H
-#define _TMW_UTILS_TOSTRING_H
-
#include <cstdarg>
+#include <cstdio>
#include "strprintf.h"
@@ -49,5 +47,3 @@ std::string strprintf(char const *format, ...)
delete [] buf2;
return res;
}
-
-#endif