1 files changed, 22 insertions, 5 deletions

diff --git a/src/tools.h b/src/tools.h
index b8dc362..43582c5 100644
--- a/src/tools.h
+++ b/src/tools.h
@@ -4,16 +4,33 @@
 #ifndef TOOLS_H
 #define TOOLS_H
 
-#include "lua.h"
+#include "lauxlib.h"
 #include "threading.h"
     // MUTEX_T
 
 #include <assert.h>
 
-// Note: The < LUA_REGISTRYINDEX test is to leave registry/global/upvalue indices untouched
-//
-#define /*int*/ STACK_ABS(L,n) \
-        ( ((n) >= 0 || (n) <= LUA_REGISTRYINDEX) ? (n) : lua_gettop(L) +(n) +1 )
+// M$ compiler doesn't support 'inline' keyword in C files...
+#if defined( _MSC_VER)
+#define inline __inline
+#endif
+
+// code is now using Lua 5.2 API
+// add Lua 5.2 API when building for Lua 5.1
+#if LUA_VERSION_NUM == 501
+#define lua_absindex( L, idx) (((idx) >= 0 || (idx) <= LUA_REGISTRYINDEX) ? (idx) : lua_gettop(L) + (idx) +1)
+#define lua_pushglobaltable(L) lua_pushvalue( L, LUA_GLOBALSINDEX)
+#define lua_setuservalue lua_setfenv
+#define lua_getuservalue lua_getfenv
+#define lua_rawlen lua_objlen
+#define luaG_registerlibfuncs( L, _funcs) luaL_register( L, NULL, _funcs)
+#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
+#define lua_equal( L, a, b) lua_compare( L, a, b, LUA_OPEQ)
+#define luaG_registerlibfuncs( L, _funcs) luaL_setfuncs( L, _funcs, 0)
+#endif // LUA_VERSION_NUM == 502
 
 #ifdef NDEBUG
   #define _ASSERT_L(lua,c)  /*nothing*/