dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r23190) -Fix: compile error due to Squirrel define messing up another included file

Browse Source
This commit is contained in:
rubidium
2011-11-11 18:59:47 +00:00
parent 4e7b4b9007
commit a46be19d86
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/3rdparty/squirrel/squirrel/sqbaselib.cpp vendored
View File

@@ -1,6 +1,9 @@
/* /*
see copyright notice in squirrel.h 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 "sqpcheader.h"
#include "sqvm.h" #include "sqvm.h"
#include "sqstring.h" #include "sqstring.h"
@@ -12,7 +15,6 @@
#include <stdlib.h> #include <stdlib.h>
#include <stdarg.h> #include <stdarg.h>
#include <ctype.h> #include <ctype.h>
#include <algorithm>
bool str2num(const SQChar *s,SQObjectPtr &res) bool str2num(const SQChar *s,SQObjectPtr &res)
{ {