From 9311774ad6c1a37f95bb2511251719d74426cbb0 Mon Sep 17 00:00:00 2001 From: Bjørn Lindeijer Date: Sat, 8 Nov 2008 16:17:30 +0000 Subject: Fixed compile error with GCC 4.4 reported by Martin Michlmayr. --- ChangeLog | 5 +++++ src/utils/strprintf.cpp | 6 +----- 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 + + * src/utils/strprintf.cpp: Fixed compile error with GCC 4.4 reported + by Martin Michlmayr. + 2008-11-06 Dennis Friis * 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 +#include #include "strprintf.h" @@ -49,5 +47,3 @@ std::string strprintf(char const *format, ...) delete [] buf2; return res; } - -#endif -- cgit v1.2.3-70-g09d2