Commit a1269ad2 authored by Rainer Jung's avatar Rainer Jung
Browse files

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
parent 7a4ea8b2

modules/lua/lua_config.c

+2 −2
Original line number Diff line number Diff line
@@ -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] */



}

modules/lua/lua_request.c

+6 −6
Original line number Diff line number Diff line
@@ -2959,7 +2959,7 @@ void ap_lua_load_request_lmodule(lua_State *L, apr_pool_t *p) 
    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);
@@ -2967,7 +2967,7 @@ void ap_lua_load_request_lmodule(lua_State *L, apr_pool_t *p) 
    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);
@@ -2975,7 +2975,7 @@ void ap_lua_load_request_lmodule(lua_State *L, apr_pool_t *p) 
    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);

modules/lua/mod_lua.h

+2 −4
Original line number Diff line number Diff line
@@ -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)