httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fua...@apache.org
Subject svn commit: r1652886 - in /httpd/httpd/trunk/modules/lua: NWGNUmakefile mod_lua.h
Date Mon, 19 Jan 2015 00:35:26 GMT
Author: fuankg
Date: Mon Jan 19 00:35:25 2015
New Revision: 1652886

URL: http://svn.apache.org/r1652886
Log:
Enable to build mod_lua against Lua 5.3.

Modified:
    httpd/httpd/trunk/modules/lua/NWGNUmakefile
    httpd/httpd/trunk/modules/lua/mod_lua.h

Modified: httpd/httpd/trunk/modules/lua/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/lua/NWGNUmakefile?rev=1652886&r1=1652885&r2=1652886&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/lua/NWGNUmakefile (original)
+++ httpd/httpd/trunk/modules/lua/NWGNUmakefile Mon Jan 19 00:35:25 2015
@@ -46,6 +46,9 @@ XCFLAGS		+= \
 #
 XDEFINES	+= \
 			-DLUA_COMPAT_ALL \
+			-DLUA_COMPAT_5_2 \
+			-DLUA_COMPAT_5_1 \
+			-DLUA_COMPAT_MODULE \
 			$(EOLIST)
 
 #

Modified: httpd/httpd/trunk/modules/lua/mod_lua.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/lua/mod_lua.h?rev=1652886&r1=1652885&r2=1652886&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/lua/mod_lua.h (original)
+++ httpd/httpd/trunk/modules/lua/mod_lua.h Mon Jan 19 00:35:25 2015
@@ -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



Mime
View raw message