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