mirror of
https://github.com/OpenTTD/OpenTTD.git
synced 2025-03-13 02:52:37 +00:00
(svn r23190) -Fix: compile error due to Squirrel define messing up another included file
This commit is contained in:
parent
d85e60803c
commit
624c8a6173
4
src/3rdparty/squirrel/squirrel/sqbaselib.cpp
vendored
4
src/3rdparty/squirrel/squirrel/sqbaselib.cpp
vendored
@ -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)
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user