From: Guenter Knauf Date: Mon, 19 Jan 2015 00:35:25 +0000 (+0000) Subject: Enable to build mod_lua against Lua 5.3. X-Git-Tag: 2.5.0-alpha~3529 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=53e79988206178abfd48a5afce775a75b96a3caf;p=apache Enable to build mod_lua against Lua 5.3. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1652886 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/modules/lua/NWGNUmakefile b/modules/lua/NWGNUmakefile index fd86b3c9ee..24f2703f58 100644 --- a/modules/lua/NWGNUmakefile +++ b/modules/lua/NWGNUmakefile @@ -46,6 +46,9 @@ XCFLAGS += \ # XDEFINES += \ -DLUA_COMPAT_ALL \ + -DLUA_COMPAT_5_2 \ + -DLUA_COMPAT_5_1 \ + -DLUA_COMPAT_MODULE \ $(EOLIST) # diff --git a/modules/lua/mod_lua.h b/modules/lua/mod_lua.h index d3cf2e9c7c..636d35c5cb 100644 --- a/modules/lua/mod_lua.h +++ b/modules/lua/mod_lua.h @@ -43,6 +43,10 @@ /* Allow for Lua 5.2 backwards compatibility */ #define LUA_COMPAT_ALL +/* Allow for Lua 5.3 backwards compatibility */ +#define LUA_COMPAT_5_2 +#define LUA_COMPAT_5_1 +#define LUA_COMPAT_MODULE #include "lua.h" #include "lauxlib.h" @@ -55,6 +59,10 @@ #else #define lua_rawlen(L,i) lua_objlen(L, (i)) #endif +#if LUA_VERSION_NUM > 502 +/* Load mode for lua_dump() */ +#define lua_dump(a,b,c) lua_dump(a,b,c,0) +#endif /* Create a set of AP_LUA_DECLARE(type), AP_LUA_DECLARE_NONSTD(type) and * AP_LUA_DECLARE_DATA with appropriate export and import tags for the platform