From 243d22d33387ed7576ac0efab509c36425a91caa Mon Sep 17 00:00:00 2001 From: Luka Blaskovic Date: Sun, 9 Aug 2020 07:18:13 +0000 Subject: [PATCH] fix redefinition of luaL_setfuncs() --- src/lxplib.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/lxplib.c b/src/lxplib.c index 1c972db..5712611 100644 --- a/src/lxplib.c +++ b/src/lxplib.c @@ -590,7 +590,7 @@ static void set_info (lua_State *L) { /* ** Adapted from Lua 5.2.0 */ -static void luaL_setfuncs (lua_State *L, const luaL_Reg *l, int nup) { +static void compat_luaL_setfuncs (lua_State *L, const luaL_Reg *l, int nup) { luaL_checkstack(L, nup, "too many upvalues"); for (; l->name != NULL; l++) { /* fill the table with given functions */ int i; @@ -602,6 +602,8 @@ static void luaL_setfuncs (lua_State *L, const luaL_Reg *l, int nup) { } lua_pop(L, nup); /* remove upvalues */ } +#else +#define compat_luaL_setfuncs(L, reg, nup) luaL_setfuncs(L, reg, nup) #endif @@ -612,11 +614,11 @@ int luaopen_lxp (lua_State *L) { lua_pushvalue(L, -2); lua_rawset(L, -3); - luaL_setfuncs (L, lxp_meths, 0); + compat_luaL_setfuncs (L, lxp_meths, 0); lua_pop (L, 1); /* remove metatable */ lua_newtable (L); - luaL_setfuncs (L, lxp_funcs, 0); + compat_luaL_setfuncs (L, lxp_funcs, 0); set_info (L); return 1; }