diff options
| author | rubidium <rubidium@openttd.org> | 2011-11-11 18:59:47 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2011-11-11 18:59:47 +0000 |
| commit | 624c8a6173357758c2e6d66b04cc0ac77407349b (patch) | |
| tree | 7d1a429882d7d23d3808679deef1a1f4aaa9c028 /src | |
| parent | d85e60803cd07d6aec491aec4fd2a9af8d56b5a2 (diff) | |
| download | openttd-624c8a6173357758c2e6d66b04cc0ac77407349b.tar.xz | |
(svn r23190) -Fix: compile error due to Squirrel define messing up another included file
Diffstat (limited to 'src')
| -rw-r--r-- | src/3rdparty/squirrel/squirrel/sqbaselib.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/3rdparty/squirrel/squirrel/sqbaselib.cpp b/src/3rdparty/squirrel/squirrel/sqbaselib.cpp index b170ac336..d9074d317 100644 --- a/src/3rdparty/squirrel/squirrel/sqbaselib.cpp +++ b/src/3rdparty/squirrel/squirrel/sqbaselib.cpp @@ -1,6 +1,9 @@ /* see copyright notice in squirrel.h */ +/* Needs to be first due to a squirrel header defining type() and type() + * being used in some versions of the headers included by algorithm. */ +#include <algorithm> #include "sqpcheader.h" #include "sqvm.h" #include "sqstring.h" @@ -12,7 +15,6 @@ #include <stdlib.h> #include <stdarg.h> #include <ctype.h> -#include <algorithm> bool str2num(const SQChar *s,SQObjectPtr &res) { |