httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fua...@apache.org
Subject svn commit: r1221205 - in /httpd/httpd/trunk/modules/lua: NWGNUmakefile mod_lua.h
Date Tue, 20 Dec 2011 11:27:43 GMT
Author: fuankg
Date: Tue Dec 20 11:27:43 2011
New Revision: 1221205

URL: http://svn.apache.org/viewvc?rev=1221205&view=rev
Log:
Make mod_lua compile with lua 5.2.x.

MOdified patch submitted by NormW (nornw gknw net).

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=1221205&r1=1221204&r2=1221205&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/lua/NWGNUmakefile (original)
+++ httpd/httpd/trunk/modules/lua/NWGNUmakefile Tue Dec 20 11:27:43 2011
@@ -44,6 +44,7 @@ XCFLAGS		+= \
 # These defines will come after DEFINES
 #
 XDEFINES	+= \
+			-DLUA_COMPAT_ALL \
 			$(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=1221205&r1=1221204&r2=1221205&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/lua/mod_lua.h (original)
+++ httpd/httpd/trunk/modules/lua/mod_lua.h Tue Dec 20 11:27:43 2011
@@ -44,6 +44,13 @@
 #include "lauxlib.h"
 #include "lualib.h"
 
+#if LUA_VERSION_NUM > 501
+/* Load mode for lua_load() */
+#define DFLT_LUA_LOAD_MODE "bt"
+#define lua_load(a,b,c,d) lua_load(a,b,c,d,DFLT_LUA_LOAD_MODE)
+#define luaL_reg luaL_Reg
+#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