From fe1923bb91416dc7d2888fd7bbd415046dc91fcc Mon Sep 17 00:00:00 2001
From: Rainer Jung <rjung@apache.org>
Date: Tue, 4 Jul 2017 21:48:41 +0000
Subject: [PATCH] Fix new compilation breakage in mod_lua.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1800830 13f79535-47bb-0310-9956-ffa450edef68
---
 modules/lua/lua_config.c  |  4 ++--
 modules/lua/lua_request.c | 12 ++++++------
 modules/lua/mod_lua.h     |  6 ++----
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/modules/lua/lua_config.c b/modules/lua/lua_config.c
index 3783b51867..14674a901d 100644
--- a/modules/lua/lua_config.c
+++ b/modules/lua/lua_config.c
@@ -265,13 +265,13 @@ void ap_lua_load_config_lmodule(lua_State *L)
     lua_pushvalue(L, -1);
 
     lua_setfield(L, -2, "__index");
-    luaL_setfuncs(L, cfg_methods);              /* [metatable] */
+    luaL_setfuncs_compat(L, cfg_methods);       /* [metatable] */
 
 
     luaL_newmetatable(L, "Apache2.CommandParameters");
     lua_pushvalue(L, -1);
 
     lua_setfield(L, -2, "__index");
-    luaL_setfuncs(L, cmd_methods);              /* [metatable] */
+    luaL_setfuncs_compat(L, cmd_methods);       /* [metatable] */
 
 }
diff --git a/modules/lua/lua_request.c b/modules/lua/lua_request.c
index 5e5a30d93f..f9f9ae640a 100644
--- a/modules/lua/lua_request.c
+++ b/modules/lua/lua_request.c
@@ -2955,27 +2955,27 @@ void ap_lua_load_request_lmodule(lua_State *L, apr_pool_t *p)
     lua_pushlightuserdata(L, dispatch);
     lua_setfield(L, LUA_REGISTRYINDEX, "Apache2.Request.dispatch");
 
-    luaL_newmetatable(L, "Apache2.Request");    /* [metatable] */
+    luaL_newmetatable(L, "Apache2.Request");     /* [metatable] */
     lua_pushvalue(L, -1);
 
     lua_setfield(L, -2, "__index");
-    luaL_setfuncs(L, request_methods);          /* [metatable] */
+    luaL_setfuncs_compat(L, request_methods);    /* [metatable] */
 
     lua_pop(L, 2);
 
-    luaL_newmetatable(L, "Apache2.Connection"); /* [metatable] */
+    luaL_newmetatable(L, "Apache2.Connection");  /* [metatable] */
     lua_pushvalue(L, -1);
 
     lua_setfield(L, -2, "__index");
-    luaL_setfuncs(L, connection_methods);       /* [metatable] */
+    luaL_setfuncs_compat(L, connection_methods); /* [metatable] */
 
     lua_pop(L, 2);
 
-    luaL_newmetatable(L, "Apache2.Server");     /* [metatable] */
+    luaL_newmetatable(L, "Apache2.Server");      /* [metatable] */
     lua_pushvalue(L, -1);
 
     lua_setfield(L, -2, "__index");
-    luaL_setfuncs(L, server_methods);           /* [metatable] */
+    luaL_setfuncs_compat(L, server_methods);     /* [metatable] */
 
     lua_pop(L, 2);
 
diff --git a/modules/lua/mod_lua.h b/modules/lua/mod_lua.h
index 1e2e71d400..3fc36f17ce 100644
--- a/modules/lua/mod_lua.h
+++ b/modules/lua/mod_lua.h
@@ -49,12 +49,10 @@
 /* Load mode for lua_load() */
 #define lua_load(a,b,c,d)  lua_load(a,b,c,d,NULL)
 #define lua_resume(a,b)    lua_resume(a, NULL, b)
-#define luaL_loadfile(a,b) luaL_loadfilex(a,b,NULL)
-#define luaL_loadbuffer(a,b,c,d) luaL_loadbufferx(a,b,c,d,NULL)
-#define luaL_setfuncs(a,b) luaL_setfuncs(a,b,0)
+#define luaL_setfuncs_compat(a,b) luaL_setfuncs(a,b,0)
 #else
 #define lua_rawlen(L,i)    lua_objlen(L, (i))
-#define luaL_setfuncs(a,b) luaL_register(a,NULL,b)
+#define luaL_setfuncs_compat(a,b) luaL_register(a,NULL,b)
 #endif
 #if LUA_VERSION_NUM > 502
 #define lua_dump(a,b,c,d) lua_dump(a,b,c,d,0)
-- 
2.40.0