summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorterkhen <terkhen@openttd.org>2011-05-25 16:35:23 +0000
committerterkhen <terkhen@openttd.org>2011-05-25 16:35:23 +0000
commit1f3853249d62ca5e23e8e2696a8ab7d22aa2cd37 (patch)
tree2f0027592f08345ec0094392b35fc310ece514a1
parent197fcab295050ff234c04436a95793b5f5722c29 (diff)
downloadopenttd-1f3853249d62ca5e23e8e2696a8ab7d22aa2cd37.tar.xz
(svn r22490) -Fix [FS#4623]: [Squirrel] Fix compilation under MinGW-w64. (JGR)
-rw-r--r--src/3rdparty/squirrel/include/squirrel.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/3rdparty/squirrel/include/squirrel.h b/src/3rdparty/squirrel/include/squirrel.h
index 7bce8f5a9..b3864b975 100644
--- a/src/3rdparty/squirrel/include/squirrel.h
+++ b/src/3rdparty/squirrel/include/squirrel.h
@@ -54,6 +54,10 @@ extern "C" {
typedef __int64 SQInteger;
typedef unsigned __int64 SQUnsignedInteger;
typedef unsigned __int64 SQHash; /*should be the same size of a pointer*/
+#elif defined(_WIN32)
+typedef long long SQInteger;
+typedef unsigned long long SQUnsignedInteger;
+typedef unsigned long long SQHash; /*should be the same size of a pointer*/
#else
typedef long SQInteger;
typedef unsigned long SQUnsignedInteger;
@@ -77,6 +81,8 @@ typedef float SQFloat;
#if defined(SQUSEDOUBLE) && !defined(_SQ64)
#ifdef _MSC_VER
typedef __int64 SQRawObjectVal; //must be 64bits
+#elif defined(_WIN32)
+typedef long long SQRawObjectVal; //must be 64bits
#else
typedef long SQRawObjectVal; //must be 64bits
#endif