From 120c9c5ad50d800924062697da6848d0764e8999 Mon Sep 17 00:00:00 2001 From: Yukita Mayako Date: Wed, 10 Jun 2015 07:41:44 -0400 Subject: [PATCH] Change int32_t to __int32 on MSC. I can't just say screw it and include the full doomtype.h here (windows.h conflict?) so a small hack here will have to do. :I --- src/blua/luaconf.h | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/blua/luaconf.h b/src/blua/luaconf.h index 4a8a41723..9e2948f41 100644 --- a/src/blua/luaconf.h +++ b/src/blua/luaconf.h @@ -10,7 +10,13 @@ #include #include + +#ifdef _MSC_VER +#define INT32 __int32 +#else #include +#define INT32 int32_t +#endif /* @@ -141,7 +147,7 @@ ** CHANGE that if ptrdiff_t is not adequate on your machine. (On most ** machines, ptrdiff_t gives a good choice between int or long.) */ -#define LUA_INTEGER int32_t +#define LUA_INTEGER INT32 /* @@ -503,13 +509,13 @@ */ //#define LUA_NUMBER_DOUBLE -#define LUA_NUMBER int32_t +#define LUA_NUMBER INT32 /* @@ LUAI_UACNUMBER is the result of an 'usual argument conversion' @* over a number. */ -#define LUAI_UACNUMBER int32_t +#define LUAI_UACNUMBER INT32 /*