Mercurial > hg > openttd
changeset 18354:e6488c86891e draft
(svn r23190) -Fix: compile error due to Squirrel define messing up another included file
author | rubidium <rubidium@openttd.org> |
---|---|
date | Fri, 11 Nov 2011 18:59:47 +0000 |
parents | 2801f49d2e33 |
children | 45af8ae925f5 |
files | src/3rdparty/squirrel/squirrel/sqbaselib.cpp |
diffstat | 1 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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) {