Lunatic fixes:

1 compiler error.
2 compiler warnings.
1 runtime warning.

Note that at this time, CPLUSPLUS=1 LUNATIC=1 fails to build due to C++ function mangling, and Win64 Lunatic crashes.

DONT_BUILD.

git-svn-id: https://svn.eduke32.com/eduke32@4540 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2014-07-10 09:01:48 +00:00
parent 0352b4ad11
commit af28013f39
7 changed files with 15 additions and 5 deletions

View file

@ -40,7 +40,9 @@
#undef __USE_MINGW_ANSI_STDIO // Workaround for MinGW-w64.
#define __STDC_FORMAT_MACROS
#ifndef __STDC_LIMIT_MACROS
#define __STDC_LIMIT_MACROS
#endif
#ifdef HAVE_INTTYPES
# include <stdint.h>
# include <inttypes.h>

View file

@ -142,7 +142,7 @@ static void L_OnOutOfMem(void)
extern void uninitengine(void);
OSD_Printf("Out of memory in Lunatic.\n");
uninitengine();
Bexit(127);
exit(127);
}
void (*L_ErrorFunc)(const char *) = NULL;
@ -175,11 +175,11 @@ int L_HandleError(lua_State *L, int errcode, void (*ErrorPrintFunc)(const char *
}
/* unreachable */
#ifdef NDEBUG
return 0;
#else
#ifndef NDEBUG
Bassert(0);
#endif
return 0;
}
static void L_ErrorPrint(const char *errmsg)

View file

@ -5,7 +5,9 @@
// Use SDL 1.2 or 2.0 from http://www.libsdl.org
#define __STDC_FORMAT_MACROS
#ifndef __STDC_LIMIT_MACROS
#define __STDC_LIMIT_MACROS
#endif
#include <stdlib.h>
#include <math.h> // pow
#include <signal.h>

View file

@ -51,7 +51,9 @@
#include "dxdidf.h" // comment this out if c_dfDI* is being reported as multiply defined
#define __STDC_FORMAT_MACROS
#ifndef __STDC_LIMIT_MACROS
#define __STDC_LIMIT_MACROS
#endif
#include <stdlib.h>
#include <signal.h>
#include <stdarg.h>

View file

@ -3,7 +3,9 @@
#ifdef USE_LIBVPX
#define __STDC_FORMAT_MACROS
#ifndef __STDC_LIMIT_MACROS
#define __STDC_LIMIT_MACROS
#endif
#include <stdint.h>

View file

@ -444,7 +444,7 @@ local function new_initial_gvartab()
}
-- Reserved bits
gamevar.LOGO_FLAGS.rbits = bit.bnot(65535)
gamevar.LOGO_FLAGS.rbits = bit.bnot(2097151)
for w=0,C.MAX_WEAPONS-1 do
for i=1,#wmembers do

View file

@ -21,7 +21,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
//-------------------------------------------------------------------------
#define __STDC_FORMAT_MACROS
#ifndef __STDC_LIMIT_MACROS
#define __STDC_LIMIT_MACROS
#endif
#include <stdio.h>
#include <string.h>