1 files changed, 25 insertions, 0 deletions

diff --git a/src/compat.h b/src/compat.h
index eaa9f85..e44f827 100644
--- a/src/compat.h
+++ b/src/compat.h
@@ -5,13 +5,29 @@
 #include "lualib.h"
 #include "lauxlib.h"
 
+// try to detect if we are building against LuaJIT or MoonJIT
+#if defined(LUA_JITLIBNAME)
+#include "luajit.h"
+#if (defined(__x86_64__) || defined(_M_X64) || defined(__LP64__))
+#define LUAJIT_FLAVOR() 64
+#else // 64 bits
+#define LUAJIT_FLAVOR() 32
+#endif // 64 bits
+#else // LUA_JITLIBNAME
+#define LUAJIT_FLAVOR() 0
+#endif // LUA_JITLIBNAME
+
+
 // code is now preferring Lua 5.4 API
 
 // add some Lua 5.3-style API when building for Lua 5.1
 #if LUA_VERSION_NUM == 501
+
 #define lua501_equal lua_equal
 #define lua_absindex( L, idx) (((idx) >= 0 || (idx) <= LUA_REGISTRYINDEX) ? (idx) : lua_gettop(L) + (idx) +1)
+#if LUAJIT_VERSION_NUM < 20200 // moonjit is 5.1 plus bits of 5.2 that we don't need to wrap
 #define lua_pushglobaltable(L) lua_pushvalue( L, LUA_GLOBALSINDEX)
+#endif // LUAJIT_VERSION_NUM
 #define lua_setuservalue lua_setfenv
 #define lua_getuservalue lua_getfenv
 #define lua_rawlen lua_objlen
@@ -21,10 +37,12 @@
 void luaL_requiref (lua_State* L, const char* modname, lua_CFunction openf, int glb); // implementation copied from Lua 5.2 sources
 #define lua504_dump( L, writer, data, strip) lua_dump( L, writer, data)
 #define LUA_LOADED_TABLE "_LOADED" // // doesn't exist in Lua 5.1
+
 #endif // LUA_VERSION_NUM == 501
 
 // wrap Lua 5.2 calls under Lua 5.1 API when it is simpler that way
 #if LUA_VERSION_NUM == 502
+
 #ifndef lua501_equal // already defined when compatibility is active in luaconf.h
 #define lua501_equal( L, a, b) lua_compare( L, a, b, LUA_OPEQ)
 #endif // lua501_equal
@@ -34,10 +52,12 @@ void luaL_requiref (lua_State* L, const char* modname, lua_CFunction openf, int
 #define luaG_registerlibfuncs( L, _funcs) luaL_setfuncs( L, _funcs, 0)
 #define lua504_dump( L, writer, data, strip) lua_dump( L, writer, data)
 #define LUA_LOADED_TABLE "_LOADED" // // doesn't exist in Lua 5.2
+
 #endif // LUA_VERSION_NUM == 502
 
 // wrap Lua 5.3 calls under Lua 5.1 API when it is simpler that way
 #if LUA_VERSION_NUM == 503
+
 #ifndef lua501_equal // already defined when compatibility is active in luaconf.h
 #define lua501_equal( L, a, b) lua_compare( L, a, b, LUA_OPEQ)
 #endif // lua501_equal
@@ -47,16 +67,20 @@ void luaL_requiref (lua_State* L, const char* modname, lua_CFunction openf, int
 #define luaG_registerlibfuncs( L, _funcs) luaL_setfuncs( L, _funcs, 0)
 #define lua504_dump lua_dump
 #define luaL_optint(L,n,d) ((int)luaL_optinteger(L, (n), (d)))
+
 #endif // LUA_VERSION_NUM == 503
 
 #if LUA_VERSION_NUM < 504
+
 void *lua_newuserdatauv( lua_State* L, size_t sz, int nuvalue);
 int lua_getiuservalue( lua_State* L, int idx, int n);
 int lua_setiuservalue( lua_State* L, int idx, int n);
+
 #endif // LUA_VERSION_NUM < 504
 
 // wrap Lua 5.4 calls under Lua 5.1 API when it is simpler that way
 #if LUA_VERSION_NUM == 504
+
 #ifndef lua501_equal // already defined when compatibility is active in luaconf.h
 #define lua501_equal( L, a, b) lua_compare( L, a, b, LUA_OPEQ)
 #endif // lua501_equal
@@ -66,6 +90,7 @@ int lua_setiuservalue( lua_State* L, int idx, int n);
 #define luaG_registerlibfuncs( L, _funcs) luaL_setfuncs( L, _funcs, 0)
 #define lua504_dump lua_dump
 #define luaL_optint(L,n,d) ((int)luaL_optinteger(L, (n), (d)))
+
 #endif // LUA_VERSION_NUM == 504
 
 #endif // __COMPAT_H__