diff -up asc-2.2.0.0/source/ASCStringHelpers.h.foo asc-2.2.0.0/source/ASCStringHelpers.h --- asc-2.2.0.0/source/ASCStringHelpers.h.foo 2007-12-08 14:19:02.000000000 +0100 +++ asc-2.2.0.0/source/ASCStringHelpers.h 2008-12-15 12:15:52.000000000 +0100 @@ -8,6 +8,7 @@ #include <cstring> #include <memory> #include <string> +#include <cstring> #include <wchar.h> #include <stdio.h> #include <ctype.h> @@ -206,9 +207,9 @@ inline size_t ASCStringHelpers::_Strlen assert ( pS != NULL ); #ifdef ASC_UNICODE - return ::wcslen ( pS ); + return wcslen ( pS ); #else - return ::strlen ( pS ); + return strlen ( pS ); #endif } @@ -232,9 +233,9 @@ inline ASCStringHelpers::charT* ASCStrin assert ( pDest != NULL ); #ifdef ASC_UNICODE - return ::wcscpy ( pDest, pSrc ); + return wcscpy ( pDest, pSrc ); #else - return ::strcpy ( pDest, pSrc ); + return strcpy ( pDest, pSrc ); #endif } @@ -353,9 +354,9 @@ inline int ASCStringHelpers::_Stricmp ( #ifndef _UNIX_ #ifdef ASC_UNICODE - return ::wcsicmp ( pS1, pS2 ); + return wcsicmp ( pS1, pS2 ); #else - return ::stricmp ( pS1, pS2 ); + return stricmp ( pS1, pS2 ); #endif #else // _UNIX_ @@ -374,9 +375,9 @@ inline int ASCStringHelpers::_Stricmp ( _Strlwr ( l_pS1 ); _Strlwr ( l_pS2 ); - return ::wcscmp ( l_pS1, l_pS2 ); + return wcscmp ( l_pS1, l_pS2 ); #else - return ::strcasecmp ( pS1, pS2 ); + return strcasecmp ( pS1, pS2 ); #endif #endif // _UNIX_ diff -up asc-2.2.0.0/source/dialogs/exchangegraphics.cpp.foo asc-2.2.0.0/source/dialogs/exchangegraphics.cpp --- asc-2.2.0.0/source/dialogs/exchangegraphics.cpp.foo 2007-04-12 22:53:24.000000000 +0200 +++ asc-2.2.0.0/source/dialogs/exchangegraphics.cpp 2008-12-15 12:15:52.000000000 +0100 @@ -15,6 +15,7 @@ * * ***************************************************************************/ +#include <limits.h> /* needed by boost/regex.hpp when compiling with gcc4.3 */ #include <boost/regex.hpp> #include "../paradialog.h" diff -up asc-2.2.0.0/source/fieldimageloader.cpp.foo asc-2.2.0.0/source/fieldimageloader.cpp --- asc-2.2.0.0/source/fieldimageloader.cpp.foo 2008-07-11 19:42:20.000000000 +0200 +++ asc-2.2.0.0/source/fieldimageloader.cpp 2008-12-15 12:15:52.000000000 +0100 @@ -19,6 +19,7 @@ #include <algorithm> #include <iostream> #include <SDL_image.h> +#include <limits.h> /* needed by boost/regex.hpp when compiling with gcc4.3 */ #include <boost/regex.hpp> #include "global.h" diff -up asc-2.2.0.0/source/sdl/sound.cpp.foo asc-2.2.0.0/source/sdl/sound.cpp --- asc-2.2.0.0/source/sdl/sound.cpp.foo 2008-06-27 21:22:12.000000000 +0200 +++ asc-2.2.0.0/source/sdl/sound.cpp 2008-12-15 12:15:52.000000000 +0100 @@ -8,6 +8,7 @@ ***************************************************************************/ +#include <limits.h> /* needed by boost/regex.hpp when compiling with gcc4.3 */ #include <boost/regex.hpp> #include <cstring> diff -up asc-2.2.0.0/source/sg.cpp.foo asc-2.2.0.0/source/sg.cpp --- asc-2.2.0.0/source/sg.cpp.foo 2008-11-30 12:04:32.000000000 +0100 +++ asc-2.2.0.0/source/sg.cpp 2008-12-15 12:16:50.000000000 +0100 @@ -78,6 +78,7 @@ #include <memory> #include <fstream> +#include <limits.h> /* needed by boost/regex.hpp when compiling with gcc4.3 */ #include <boost/regex.hpp> #include "paradialog.h" diff -up asc-2.2.0.0/source/sgstream.cpp.foo asc-2.2.0.0/source/sgstream.cpp --- asc-2.2.0.0/source/sgstream.cpp.foo 2008-11-23 19:16:48.000000000 +0100 +++ asc-2.2.0.0/source/sgstream.cpp 2008-12-15 12:15:52.000000000 +0100 @@ -36,6 +36,7 @@ #include <sys/types.h> #include <sys/stat.h> #include <fstream> +#include <limits.h> /* needed by boost/regex.hpp when compiling with gcc4.3 */ #include <boost/regex.hpp> #include "global.h" diff -up asc-2.2.0.0/source/textfile_evaluation.cpp.foo asc-2.2.0.0/source/textfile_evaluation.cpp --- asc-2.2.0.0/source/textfile_evaluation.cpp.foo 2007-12-16 18:57:43.000000000 +0100 +++ asc-2.2.0.0/source/textfile_evaluation.cpp 2008-12-15 12:15:52.000000000 +0100 @@ -36,6 +36,7 @@ #include "Windows.h" #endif +#include <limits.h> /* needed by boost/regex.hpp when compiling with gcc4.3 */ #include <boost/regex.hpp> diff -up asc-2.2.0.0/source/tools/makegfx.cpp.foo asc-2.2.0.0/source/tools/makegfx.cpp --- asc-2.2.0.0/source/tools/makegfx.cpp.foo 2007-07-08 17:25:21.000000000 +0200 +++ asc-2.2.0.0/source/tools/makegfx.cpp 2008-12-15 12:15:52.000000000 +0100 @@ -10,6 +10,7 @@ #include <SDL_image.h> #include <SDL.h> +#include <limits.h> /* needed by boost/regex.hpp when compiling with gcc4.3 */ #include <boost/regex.hpp> #include "../basegfx.h" diff -up asc-2.2.0.0/source/widgets/textrenderer-addons.cpp.foo asc-2.2.0.0/source/widgets/textrenderer-addons.cpp --- asc-2.2.0.0/source/widgets/textrenderer-addons.cpp.foo 2007-04-13 18:16:18.000000000 +0200 +++ asc-2.2.0.0/source/widgets/textrenderer-addons.cpp 2008-12-15 12:15:52.000000000 +0100 @@ -17,6 +17,7 @@ +#include <limits.h> /* needed by boost/regex.hpp when compiling with gcc4.3 */ #include <boost/regex.hpp> #include <pglabel.h> #include <pgimage.h> diff -up asc-2.2.0.0/source/widgets/textrenderer.cpp.foo asc-2.2.0.0/source/widgets/textrenderer.cpp --- asc-2.2.0.0/source/widgets/textrenderer.cpp.foo 2008-11-23 19:16:48.000000000 +0100 +++ asc-2.2.0.0/source/widgets/textrenderer.cpp 2008-12-15 12:15:52.000000000 +0100 @@ -17,6 +17,7 @@ +#include <limits.h> /* needed by boost/regex.hpp when compiling with gcc4.3 */ #include <boost/regex.hpp> #include <pglabel.h> #include <pgimage.h>