Update to the latest Lua headers

qaisjp · qaisjp · commit 53f0ab195539 · 2020-06-02T19:42:24.000+01:00
Also sneak in a DLL consistency - now it always builds to king.dll.
diff --git a/amx-deps/src/include/lapi.h b/amx-deps/src/include/lapi.h
@@ -1,5 +1,5 @@
 /*
-** $Id: lapi.h,v 2.2 2005/04/25 19:24:10 roberto Exp $
+** $Id: lapi.h,v 2.2.1.1 2007/12/27 13:02:25 roberto Exp $
 ** Auxiliary functions from Lua API
 ** See Copyright Notice in lua.h
 */
diff --git a/amx-deps/src/include/lcode.h b/amx-deps/src/include/lcode.h
@@ -1,5 +1,5 @@
 /*
-** $Id: lcode.h,v 1.48 2006/03/21 19:28:03 roberto Exp $
+** $Id: lcode.h,v 1.48.1.1 2007/12/27 13:02:25 roberto Exp $
 ** Code generator for Lua
 ** See Copyright Notice in lua.h
 */
diff --git a/amx-deps/src/include/ldebug.h b/amx-deps/src/include/ldebug.h
@@ -1,5 +1,5 @@
 /*
-** $Id: ldebug.h,v 2.3 2005/04/25 19:24:10 roberto Exp $
+** $Id: ldebug.h,v 2.3.1.1 2007/12/27 13:02:25 roberto Exp $
 ** Auxiliary functions from Debug Interface module
 ** See Copyright Notice in lua.h
 */
diff --git a/amx-deps/src/include/ldo.h b/amx-deps/src/include/ldo.h
@@ -1,5 +1,5 @@
 /*
-** $Id: ldo.h,v 2.7 2005/08/24 16:15:49 roberto Exp $
+** $Id: ldo.h,v 2.7.1.1 2007/12/27 13:02:25 roberto Exp $
 ** Stack and Call structure of Lua
 ** See Copyright Notice in lua.h
 */
@@ -12,6 +12,7 @@
 #include "lstate.h"
 #include "lzio.h"
 
+
 #define luaD_checkstack(L,n)	\
   if ((char *)L->stack_last - (char *)L->top <= (n)*(int)sizeof(TValue)) \
     luaD_growstack(L, n); \
diff --git a/amx-deps/src/include/lfunc.h b/amx-deps/src/include/lfunc.h
@@ -1,5 +1,5 @@
 /*
-** $Id: lfunc.h,v 2.4 2005/04/25 19:24:10 roberto Exp $
+** $Id: lfunc.h,v 2.4.1.1 2007/12/27 13:02:25 roberto Exp $
 ** Auxiliary functions to manipulate prototypes and closures
 ** See Copyright Notice in lua.h
 */
diff --git a/amx-deps/src/include/lgc.h b/amx-deps/src/include/lgc.h
@@ -1,5 +1,5 @@
 /*
-** $Id: lgc.h,v 2.15 2005/08/24 16:15:49 roberto Exp $
+** $Id: lgc.h,v 2.15.1.1 2007/12/27 13:02:25 roberto Exp $
 ** Garbage Collector
 ** See Copyright Notice in lua.h
 */
diff --git a/amx-deps/src/include/llex.h b/amx-deps/src/include/llex.h
@@ -1,5 +1,5 @@
 /*
-** $Id: llex.h,v 1.58 2006/03/23 18:23:32 roberto Exp $
+** $Id: llex.h,v 1.58.1.1 2007/12/27 13:02:25 roberto Exp $
 ** Lexical Analyzer
 ** See Copyright Notice in lua.h
 */
diff --git a/amx-deps/src/include/llimits.h b/amx-deps/src/include/llimits.h
@@ -1,5 +1,5 @@
 /*
-** $Id: llimits.h,v 1.69 2005/12/27 17:12:00 roberto Exp $
+** $Id: llimits.h,v 1.69.1.1 2007/12/27 13:02:25 roberto Exp $
 ** Limits, basic types, and some other `installation-dependent' definitions
 ** See Copyright Notice in lua.h
 */
diff --git a/amx-deps/src/include/lmem.h b/amx-deps/src/include/lmem.h
@@ -1,5 +1,5 @@
 /*
-** $Id: lmem.h,v 1.31 2005/04/25 19:24:10 roberto Exp $
+** $Id: lmem.h,v 1.31.1.1 2007/12/27 13:02:25 roberto Exp $
 ** Interface to Memory Manager
 ** See Copyright Notice in lua.h
 */
diff --git a/amx-deps/src/include/lobject.h b/amx-deps/src/include/lobject.h
@@ -1,5 +1,5 @@
 /*
-** $Id: lobject.h,v 2.20 2006/01/18 11:37:34 roberto Exp $
+** $Id: lobject.h,v 2.20.1.2 2008/08/06 13:29:48 roberto Exp $
 ** Type definitions for Lua objects
 ** See Copyright Notice in lua.h
 */
@@ -208,7 +208,7 @@ typedef union TString {
 
 
 #define getstr(ts)	cast(const char *, (ts) + 1)
-#define svalue(o)       getstr(tsvalue(o))
+#define svalue(o)       getstr(rawtsvalue(o))
 
 
 
diff --git a/amx-deps/src/include/lopcodes.h b/amx-deps/src/include/lopcodes.h
@@ -1,5 +1,5 @@
 /*
-** $Id: lopcodes.h,v 1.125 2006/03/14 19:04:44 roberto Exp $
+** $Id: lopcodes.h,v 1.125.1.1 2007/12/27 13:02:25 roberto Exp $
 ** Opcodes for Lua virtual machine
 ** See Copyright Notice in lua.h
 */
diff --git a/amx-deps/src/include/lparser.h b/amx-deps/src/include/lparser.h
@@ -1,5 +1,5 @@
 /*
-** $Id: lparser.h,v 1.57 2006/03/09 18:14:31 roberto Exp $
+** $Id: lparser.h,v 1.57.1.1 2007/12/27 13:02:25 roberto Exp $
 ** Lua Parser
 ** See Copyright Notice in lua.h
 */
diff --git a/amx-deps/src/include/lstate.h b/amx-deps/src/include/lstate.h
@@ -1,5 +1,5 @@
 /*
-** $Id: lstate.h,v 2.24 2006/02/06 18:27:59 roberto Exp $
+** $Id: lstate.h,v 2.24.1.2 2008/01/03 15:20:39 roberto Exp $
 ** Global State
 ** See Copyright Notice in lua.h
 */
@@ -112,6 +112,7 @@ struct lua_State {
   int stacksize;
   int size_ci;  /* size of array `base_ci' */
   unsigned short nCcalls;  /* number of nested C calls */
+  unsigned short baseCcalls;  /* nested C calls when resuming coroutine */
   lu_byte hookmask;
   lu_byte allowhook;
   int basehookcount;
diff --git a/amx-deps/src/include/lstring.h b/amx-deps/src/include/lstring.h
@@ -1,5 +1,5 @@
 /*
-** $Id: lstring.h,v 1.43 2005/04/25 19:24:10 roberto Exp $
+** $Id: lstring.h,v 1.43.1.1 2007/12/27 13:02:25 roberto Exp $
 ** String table (keep all strings handled by Lua)
 ** See Copyright Notice in lua.h
 */
diff --git a/amx-deps/src/include/ltable.h b/amx-deps/src/include/ltable.h
@@ -1,5 +1,5 @@
 /*
-** $Id: ltable.h,v 2.10 2006/01/10 13:13:06 roberto Exp $
+** $Id: ltable.h,v 2.10.1.1 2007/12/27 13:02:25 roberto Exp $
 ** Lua tables (hash)
 ** See Copyright Notice in lua.h
 */
diff --git a/amx-deps/src/include/ltm.h b/amx-deps/src/include/ltm.h
@@ -1,5 +1,5 @@
 /*
-** $Id: ltm.h,v 2.6 2005/06/06 13:30:25 roberto Exp $
+** $Id: ltm.h,v 2.6.1.1 2007/12/27 13:02:25 roberto Exp $
 ** Tag methods
 ** See Copyright Notice in lua.h
 */
diff --git a/amx-deps/src/include/lua.h b/amx-deps/src/include/lua.h
@@ -1,5 +1,5 @@
 /*
-** $Id: lua.h,v 1.218.1.5 2008/08/06 13:30:12 roberto Exp $
+** $Id: lua.h,v 1.218.1.7 2012/01/13 20:36:20 roberto Exp $
 ** Lua - An Extensible Extension Language
 ** Lua.org, PUC-Rio, Brazil (http://www.lua.org)
 ** See Copyright Notice at the end of this file
@@ -17,9 +17,9 @@
 
 
 #define LUA_VERSION	"Lua 5.1"
-#define LUA_RELEASE	"Lua 5.1.4"
+#define LUA_RELEASE	"Lua 5.1.5"
 #define LUA_VERSION_NUM	501
-#define LUA_COPYRIGHT	"Copyright (C) 1994-2008 Lua.org, PUC-Rio"
+#define LUA_COPYRIGHT	"Copyright (C) 1994-2012 Lua.org, PUC-Rio"
 #define LUA_AUTHORS 	"R. Ierusalimschy, L. H. de Figueiredo & W. Celes"
 
 
@@ -55,8 +55,13 @@ typedef int (*lua_CFunction) (lua_State *L);
 ** MTA Specific stuff written by Oli for pre C Function call hooking
 */
 typedef int (*lua_PreCallHook) ( lua_CFunction f, lua_State* L );
-void lua_registerPreCallHook ( lua_PreCallHook f );
+LUA_API void lua_registerPreCallHook ( lua_PreCallHook f );
+typedef void (*lua_PostCallHook) ( lua_CFunction f, lua_State* L );
+LUA_API void lua_registerPostCallHook ( lua_PostCallHook f );
 
+// MTA Specific
+typedef int (*lua_UndumpHook) ( const char* p, size_t n );
+LUA_API void lua_registerUndumpHook ( lua_UndumpHook f );
 
 /*
 ** functions that read/write blocks when loading/dumping Lua chunks
@@ -90,7 +95,7 @@ typedef void * (*lua_Alloc) (void *ud, void *ptr, size_t osize, size_t nsize);
 
 
 /* minimum Lua stack available to a C function */
-#define LUA_MINSTACK	20
+#define LUA_MINSTACK	50     // MTA change. Was 20
 
 
 /*
@@ -119,7 +124,6 @@ LUA_API lua_State *(lua_newthread) (lua_State *L);
 
 LUA_API lua_CFunction (lua_atpanic) (lua_State *L, lua_CFunction panicf);
 
-
 // MTA Specific functions.
 // ChrML: Added function to get the main state from a lua state that is a coroutine
 LUA_API lua_State* (lua_getmainstate) (lua_State* L);
@@ -134,6 +138,7 @@ LUA_API void  (lua_remove) (lua_State *L, int idx);
 LUA_API void  (lua_insert) (lua_State *L, int idx);
 LUA_API void  (lua_replace) (lua_State *L, int idx);
 LUA_API int   (lua_checkstack) (lua_State *L, int sz);
+LUA_API int   (lua_getstackgap) (lua_State *L);         // MTA addition
 
 LUA_API void  (lua_xmove) (lua_State *from, lua_State *to, int n);
 
@@ -155,6 +160,7 @@ LUA_API int            (lua_lessthan) (lua_State *L, int idx1, int idx2);
 
 LUA_API lua_Number      (lua_tonumber) (lua_State *L, int idx);
 LUA_API lua_Integer     (lua_tointeger) (lua_State *L, int idx);
+LUA_API lua_Integer     (lua_tointegerW) (lua_State *L, int idx);   // MTA Specific
 LUA_API int             (lua_toboolean) (lua_State *L, int idx);
 LUA_API const char     *(lua_tolstring) (lua_State *L, int idx, size_t *len);
 LUA_API size_t          (lua_objlen) (lua_State *L, int idx);
@@ -180,7 +186,6 @@ LUA_API void  (lua_pushboolean) (lua_State *L, int b);
 LUA_API void  (lua_pushlightuserdata) (lua_State *L, void *p);
 LUA_API int   (lua_pushthread) (lua_State *L);
 
-
 /*
 ** get functions (Lua -> stack)
 */
@@ -304,6 +309,9 @@ LUA_API void lua_setallocf (lua_State *L, lua_Alloc f, void *ud);
 #define lua_Chunkwriter		lua_Writer
 
 
+/* hack */
+LUA_API void lua_setlevel	(lua_State *from, lua_State *to);
+
 
 /*
 ** {======================================================================
@@ -348,6 +356,7 @@ LUA_API int lua_sethook (lua_State *L, lua_Hook func, int mask, int count);
 LUA_API lua_Hook lua_gethook (lua_State *L);
 LUA_API int lua_gethookmask (lua_State *L);
 LUA_API int lua_gethookcount (lua_State *L);
+LUA_API void lua_addtotalbytes(lua_State *L, int n);
 
 
 struct lua_Debug {
@@ -369,7 +378,7 @@ struct lua_Debug {
 
 
 /******************************************************************************
-* Copyright (C) 1994-2008 Lua.org, PUC-Rio.  All rights reserved.
+* Copyright (C) 1994-2012 Lua.org, PUC-Rio.  All rights reserved.
 *
 * Permission is hereby granted, free of charge, to any person obtaining
 * a copy of this software and associated documentation files (the
diff --git a/amx-deps/src/include/luaconf.h b/amx-deps/src/include/luaconf.h
@@ -153,10 +153,16 @@
 */
 #if defined(LUA_BUILD_AS_DLL)
 
-#if defined(LUA_CORE) || defined(LUA_LIB)
-#define LUA_API __declspec(dllexport)
+#ifdef LUA_WIN
+	#if defined(LUA_CORE) || defined(LUA_LIB)
+		#define LUA_API __declspec(dllexport)
+	#else
+		#define LUA_API __declspec(dllimport)
+	#endif
 #else
-#define LUA_API __declspec(dllimport)
+	#if defined(LUA_CORE) || defined(LUA_LIB)
+		#define LUA_API extern __attribute__((visibility("default")))
+	#endif
 #endif
 
 #else
@@ -251,7 +257,7 @@
 ** CHANGE it if your stand-alone interpreter has a different name and
 ** your system is not able to detect that name automatically.
 */
-#define LUA_PROGNAME		"luajit"
+#define LUA_PROGNAME		"lua"
 
 
 /*
@@ -318,8 +324,6 @@
 @@ LUA_COMPAT_GETN controls compatibility with old getn behavior.
 ** CHANGE it (define it) if you want exact compatibility with the
 ** behavior of setn/getn in Lua 5.0.
-**
-** Note: this is not supported by LuaJIT. Leave it undefined.
 */
 #undef LUA_COMPAT_GETN
 
@@ -334,10 +338,6 @@
 @@ LUA_COMPAT_VARARG controls compatibility with old vararg feature.
 ** CHANGE it to undefined as soon as your programs use only '...' to
 ** access vararg parameters (instead of the old 'arg' table).
-**
-** Note: this has a slightly negative performance impact with LuaJIT
-** for all vararg functions. Leave it off if possible and upgrade your
-** code (replace unpack(arg) with ... and/or add local arg = {...}).
 */
 #define LUA_COMPAT_VARARG
 
@@ -381,7 +381,12 @@
 ** with Lua. A useful redefinition is to use assert.h.
 */
 #if defined(LUA_USE_APICHECK)
-#include <assert.h>
+/////////////////////////////////////////////////////////////////////////
+// MTA addition for testing if apicheck will function as expected, and generating more useful crash dumps
+    #undef assert
+    #define assert(_Expression) (void)( (!!(_Expression)) || ( *((int*)NULL) = 0) )
+    LUA_API int luaX_is_apicheck_enabled();
+/////////////////////////////////////////////////////////////////////////
 #define luai_apicheck(L,o)	{ (void)L; assert(o); }
 #else
 #define luai_apicheck(L,o)	{ (void)L; }
@@ -452,6 +457,7 @@
 #define LUAI_MAXCSTACK	8000
 
 
+
 /*
 ** {==================================================================
 ** CHANGE (to smaller values) the following definitions if your system
@@ -587,24 +593,6 @@ union luai_Cast { double l_d; long l_l; };
 
 #endif
 
-
-/*
-@@ LUA_TVALUE_ALIGN specifies extra alignment constraints for the
-@@ tagged value structure to get better lua_Number alignment.
-** CHANGE it to an empty define if you want to save some space
-** at the cost of execution time. Note that this is only needed
-** for the x86 ABI on most POSIX systems, but not on Windows and
-** not for most other CPUs. If you change it then you need to follow
-** the instructions in ljit_x86.dash, too (look for TVALUE_SIZE).
-*/
-
-#if defined(LUA_NUMBER_DOUBLE) && defined(__GNUC__) && \
-    (defined(__i386) || defined(__i386__)) && !defined(_WIN32)
-#define LUA_TVALUE_ALIGN	__attribute__ ((aligned(8)))
-#else
-#define LUA_TVALUE_ALIGN
-#endif
-
 /* }================================================================== */
 
 
diff --git a/amx-deps/src/include/lualib.h b/amx-deps/src/include/lualib.h
@@ -1,5 +1,5 @@
 /*
-** $Id: lualib.h,v 1.36 2005/12/27 17:12:00 roberto Exp $
+** $Id: lualib.h,v 1.36.1.1 2007/12/27 13:02:25 roberto Exp $
 ** Lua standard libraries
 ** See Copyright Notice in lua.h
 */
@@ -39,14 +39,12 @@ LUALIB_API int (luaopen_debug) (lua_State *L);
 #define LUA_LOADLIBNAME	"package"
 LUALIB_API int (luaopen_package) (lua_State *L);
 
-#define LUA_JITLIBNAME "jit"
-LUALIB_API int (luaopen_jit) (lua_State *L);
-
 
 /* open all previous libraries */
 LUALIB_API void (luaL_openlibs) (lua_State *L); 
 
-
+/* Additional luautf8 library */
+LUALIB_API int luaopen_utf8(lua_State *L);
 
 #ifndef lua_assert
 #define lua_assert(x)	((void)0)
diff --git a/amx-deps/src/include/lundump.h b/amx-deps/src/include/lundump.h
@@ -1,5 +1,5 @@
 /*
-** $Id: lundump.h,v 1.40 2005/11/11 14:03:13 lhf Exp $
+** $Id: lundump.h,v 1.37.1.1 2007/12/27 13:02:25 roberto Exp $
 ** load precompiled Lua chunks
 ** See Copyright Notice in lua.h
 */
diff --git a/amx-deps/src/include/lvm.h b/amx-deps/src/include/lvm.h
@@ -1,5 +1,5 @@
 /*
-** $Id: lvm.h,v 2.5 2005/08/22 18:54:49 roberto Exp $
+** $Id: lvm.h,v 2.5.1.1 2007/12/27 13:02:25 roberto Exp $
 ** Lua virtual machine
 ** See Copyright Notice in lua.h
 */
diff --git a/amx-deps/src/include/lzio.h b/amx-deps/src/include/lzio.h
@@ -1,5 +1,5 @@
 /*
-** $Id: lzio.h,v 1.21 2005/05/17 19:49:15 roberto Exp $
+** $Id: lzio.h,v 1.21.1.1 2007/12/27 13:02:25 roberto Exp $
 ** Buffered streams
 ** See Copyright Notice in lua.h
 */
@@ -59,6 +59,7 @@ struct Zio {
   lua_Reader reader;
   void* data;			/* additional data */
   lua_State *L;			/* Lua state (for reader) */
+  int eoz;			/* true if reader has no more data */
 };
 
 
diff --git a/amx-deps/src/ml_base.vcxproj b/amx-deps/src/ml_base.vcxproj
diff --git a/amx-deps/src/ml_base.vcxproj.filters b/amx-deps/src/ml_base.vcxproj.filters
