From e8a72f823400577466a98e3a32f0809c6ad8f62a Mon Sep 17 00:00:00 2001 From: rubidium Date: Sat, 6 Sep 2014 20:20:35 +0000 Subject: [PATCH] (svn r26781) -Codechange [Squirrel]: remove includes/definitions that are already in stdafx.h --- src/3rdparty/squirrel/etc/minimal.c | 1 - src/3rdparty/squirrel/include/squirrel.h | 20 ------------------- src/3rdparty/squirrel/sqstdlib/sqstdaux.cpp | 2 -- src/3rdparty/squirrel/sqstdlib/sqstdblob.cpp | 1 - src/3rdparty/squirrel/sqstdlib/sqstdio.cpp | 1 - src/3rdparty/squirrel/sqstdlib/sqstdmath.cpp | 1 - src/3rdparty/squirrel/sqstdlib/sqstdrex.cpp | 3 --- .../squirrel/sqstdlib/sqstdstream.cpp | 3 --- .../squirrel/sqstdlib/sqstdstring.cpp | 5 ----- .../squirrel/sqstdlib/sqstdsystem.cpp | 2 -- src/3rdparty/squirrel/squirrel/sqbaselib.cpp | 2 -- src/3rdparty/squirrel/squirrel/sqdebug.cpp | 3 +-- .../squirrel/squirrel/sqfuncstate.cpp | 2 +- src/3rdparty/squirrel/squirrel/sqlexer.cpp | 1 - src/3rdparty/squirrel/squirrel/sqpcheader.h | 4 ---- src/3rdparty/squirrel/squirrel/sqvm.cpp | 3 +-- 16 files changed, 3 insertions(+), 51 deletions(-) diff --git a/src/3rdparty/squirrel/etc/minimal.c b/src/3rdparty/squirrel/etc/minimal.c index 660647be4f..ea661c49e6 100644 --- a/src/3rdparty/squirrel/etc/minimal.c +++ b/src/3rdparty/squirrel/etc/minimal.c @@ -2,7 +2,6 @@ #include #include -#include #include #ifdef _MSC_VER diff --git a/src/3rdparty/squirrel/include/squirrel.h b/src/3rdparty/squirrel/include/squirrel.h index c598b9dc70..b71de14731 100644 --- a/src/3rdparty/squirrel/include/squirrel.h +++ b/src/3rdparty/squirrel/include/squirrel.h @@ -31,20 +31,6 @@ to the following restrictions: #ifndef _SQUIRREL_H_ #define _SQUIRREL_H_ -#if defined(_MSC_VER) -# define inline __forceinline -#endif /* _MSC_VER */ - -#if defined(_MSC_VER) && _MSC_VER >= 1400 // MSVC 2005 safety checks -# pragma warning(disable: 4996) // '_wfopen' was declared deprecated -# define _CRT_SECURE_NO_DEPRECATE // all deprecated 'unsafe string functions -# define _CRT_NON_CONFORMING_SWPRINTFS // another deprecated stuff -#endif /* _MSC_VER >= 1400 */ - -#if defined(__GNUC__) - #define __int64 long long -#endif - typedef __int64 SQInteger; typedef unsigned __int64 SQUnsignedInteger; typedef unsigned __int64 SQHash; /*should be the same size of a pointer*/ @@ -84,12 +70,6 @@ struct SQDelegable; typedef char SQChar; #define MAX_CHAR 0xFFFF -#if defined(_MSC_VER) || defined(__MINGW32__) - #define SQ_PRINTF64 "%I64d" -#else - #define SQ_PRINTF64 "%lld" -#endif - #define SQUIRREL_VERSION "Squirrel 2.2.5 stable - With custom OpenTTD modifications" #define SQUIRREL_COPYRIGHT "Copyright (C) 2003-2010 Alberto Demichelis" #define SQUIRREL_AUTHOR "Alberto Demichelis" diff --git a/src/3rdparty/squirrel/sqstdlib/sqstdaux.cpp b/src/3rdparty/squirrel/sqstdlib/sqstdaux.cpp index fcd3c33bec..67b299bcec 100644 --- a/src/3rdparty/squirrel/sqstdlib/sqstdaux.cpp +++ b/src/3rdparty/squirrel/sqstdlib/sqstdaux.cpp @@ -4,8 +4,6 @@ #include #include -#include -#include #include "../../../safeguards.h" diff --git a/src/3rdparty/squirrel/sqstdlib/sqstdblob.cpp b/src/3rdparty/squirrel/sqstdlib/sqstdblob.cpp index fb9a51b60c..6f3e6a91ae 100644 --- a/src/3rdparty/squirrel/sqstdlib/sqstdblob.cpp +++ b/src/3rdparty/squirrel/sqstdlib/sqstdblob.cpp @@ -2,7 +2,6 @@ #include #include #include -#include #include #include "sqstdstream.h" #include "sqstdblobimpl.h" diff --git a/src/3rdparty/squirrel/sqstdlib/sqstdio.cpp b/src/3rdparty/squirrel/sqstdlib/sqstdio.cpp index 0a05c4c9eb..795bf3a95f 100644 --- a/src/3rdparty/squirrel/sqstdlib/sqstdio.cpp +++ b/src/3rdparty/squirrel/sqstdlib/sqstdio.cpp @@ -2,7 +2,6 @@ #include #include #include -#include #include "sqstdstream.h" #define SQSTD_FILE_TYPE_TAG (SQSTD_STREAM_TYPE_TAG | 0x00000001) diff --git a/src/3rdparty/squirrel/sqstdlib/sqstdmath.cpp b/src/3rdparty/squirrel/sqstdlib/sqstdmath.cpp index e1c9da2660..0ff0090209 100644 --- a/src/3rdparty/squirrel/sqstdlib/sqstdmath.cpp +++ b/src/3rdparty/squirrel/sqstdlib/sqstdmath.cpp @@ -4,7 +4,6 @@ #include #include -#include #include #include "../../../safeguards.h" diff --git a/src/3rdparty/squirrel/sqstdlib/sqstdrex.cpp b/src/3rdparty/squirrel/sqstdlib/sqstdrex.cpp index 4029bff62f..2bc3684a5e 100644 --- a/src/3rdparty/squirrel/sqstdlib/sqstdrex.cpp +++ b/src/3rdparty/squirrel/sqstdlib/sqstdrex.cpp @@ -1,7 +1,5 @@ /* see copyright notice in squirrel.h */ #include -#include -#include #include #include "sqstdstring.h" @@ -12,7 +10,6 @@ #endif #ifdef _DEBUG -#include static const SQChar *g_nnames[] = { diff --git a/src/3rdparty/squirrel/sqstdlib/sqstdstream.cpp b/src/3rdparty/squirrel/sqstdlib/sqstdstream.cpp index 8c37e89398..b4dc371fd6 100644 --- a/src/3rdparty/squirrel/sqstdlib/sqstdstream.cpp +++ b/src/3rdparty/squirrel/sqstdlib/sqstdstream.cpp @@ -1,8 +1,5 @@ /* see copyright notice in squirrel.h */ -#include #include -#include -#include #include #include #include diff --git a/src/3rdparty/squirrel/sqstdlib/sqstdstring.cpp b/src/3rdparty/squirrel/sqstdlib/sqstdstring.cpp index 777302efce..8639b6456a 100644 --- a/src/3rdparty/squirrel/sqstdlib/sqstdstring.cpp +++ b/src/3rdparty/squirrel/sqstdlib/sqstdstring.cpp @@ -1,11 +1,6 @@ /* see copyright notice in squirrel.h */ #include #include -#include -#include -#include -#include -#include #include #define scstrchr strchr diff --git a/src/3rdparty/squirrel/sqstdlib/sqstdsystem.cpp b/src/3rdparty/squirrel/sqstdlib/sqstdsystem.cpp index c30f987666..e66efa007e 100644 --- a/src/3rdparty/squirrel/sqstdlib/sqstdsystem.cpp +++ b/src/3rdparty/squirrel/sqstdlib/sqstdsystem.cpp @@ -1,8 +1,6 @@ /* see copyright notice in squirrel.h */ #include #include -#include -#include #include #define scgetenv getenv diff --git a/src/3rdparty/squirrel/squirrel/sqbaselib.cpp b/src/3rdparty/squirrel/squirrel/sqbaselib.cpp index cd17536aea..25179de297 100644 --- a/src/3rdparty/squirrel/squirrel/sqbaselib.cpp +++ b/src/3rdparty/squirrel/squirrel/sqbaselib.cpp @@ -15,9 +15,7 @@ #include "sqfuncproto.h" #include "sqclosure.h" #include "sqclass.h" -#include #include -#include #include "../../../safeguards.h" diff --git a/src/3rdparty/squirrel/squirrel/sqdebug.cpp b/src/3rdparty/squirrel/squirrel/sqdebug.cpp index 109674f1e2..69a781aedf 100644 --- a/src/3rdparty/squirrel/squirrel/sqdebug.cpp +++ b/src/3rdparty/squirrel/squirrel/sqdebug.cpp @@ -6,7 +6,6 @@ #include #include "sqpcheader.h" -#include #include "sqvm.h" #include "sqfuncproto.h" #include "sqclosure.h" @@ -87,7 +86,7 @@ SQString *SQVM::PrintObjVal(const SQObject &o) switch(type(o)) { case OT_STRING: return _string(o); case OT_INTEGER: - seprintf(buf, lastof(buf), SQ_PRINTF64, _integer(o)); + seprintf(buf, lastof(buf), OTTD_PRINTF64, _integer(o)); return SQString::Create(_ss(this), buf); case OT_FLOAT: seprintf(buf, lastof(buf), "%.14g", _float(o)); diff --git a/src/3rdparty/squirrel/squirrel/sqfuncstate.cpp b/src/3rdparty/squirrel/squirrel/sqfuncstate.cpp index 0259d47d8d..ec538713a4 100644 --- a/src/3rdparty/squirrel/squirrel/sqfuncstate.cpp +++ b/src/3rdparty/squirrel/squirrel/sqfuncstate.cpp @@ -85,7 +85,7 @@ void DumpLiteral(SQObjectPtr &o) switch(type(o)){ case OT_STRING: printf("\"%s\"",_stringval(o));break; case OT_FLOAT: printf("{%f}",_float(o));break; - case OT_INTEGER: printf("{" SQ_PRINTF64 "}",_integer(o));break; + case OT_INTEGER: printf("{" OTTD_PRINTF64 "}",_integer(o));break; case OT_BOOL: printf("%s",_integer(o)?"true":"false");break; default: printf("(%s %p)",GetTypeName(o),(void*)_rawval(o));break; break; //shut up compiler } diff --git a/src/3rdparty/squirrel/squirrel/sqlexer.cpp b/src/3rdparty/squirrel/squirrel/sqlexer.cpp index 3d2ab05fae..286963db45 100644 --- a/src/3rdparty/squirrel/squirrel/sqlexer.cpp +++ b/src/3rdparty/squirrel/squirrel/sqlexer.cpp @@ -6,7 +6,6 @@ #include "sqpcheader.h" #include -#include #include "sqtable.h" #include "sqstring.h" #include "sqcompiler.h" diff --git a/src/3rdparty/squirrel/squirrel/sqpcheader.h b/src/3rdparty/squirrel/squirrel/sqpcheader.h index db49f5e0d1..3cebdd11ac 100644 --- a/src/3rdparty/squirrel/squirrel/sqpcheader.h +++ b/src/3rdparty/squirrel/squirrel/sqpcheader.h @@ -6,10 +6,6 @@ #include #endif -#include -#include -#include -#include #include //squirrel stuff #include diff --git a/src/3rdparty/squirrel/squirrel/sqvm.cpp b/src/3rdparty/squirrel/squirrel/sqvm.cpp index 745ad30d73..08303e80f9 100644 --- a/src/3rdparty/squirrel/squirrel/sqvm.cpp +++ b/src/3rdparty/squirrel/squirrel/sqvm.cpp @@ -7,7 +7,6 @@ #include #include "sqpcheader.h" #include -#include #include "sqopcodes.h" #include "sqfuncproto.h" #include "sqvm.h" @@ -267,7 +266,7 @@ void SQVM::ToString(const SQObjectPtr &o,SQObjectPtr &res) seprintf(buf, lastof(buf),"%g",_float(o)); break; case OT_INTEGER: - seprintf(buf, lastof(buf),SQ_PRINTF64,_integer(o)); + seprintf(buf, lastof(buf),OTTD_PRINTF64,_integer(o)); break; case OT_BOOL: seprintf(buf, lastof(buf),_integer(o)?"true":"false");