diff options
author | Kim Alvefur <zash@zash.se> | 2015-08-20 13:05:22 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2015-08-20 13:05:22 +0200 |
commit | 6ef7c4d80892f486d71e660b054bdfdb993c8528 (patch) | |
tree | 103fd7d9396b60b9f76071a009c54d3ca9d35744 /util-src/signal.c | |
parent | a9029bd099734436154fc4e794d3b958e54d1943 (diff) | |
parent | d32f36b2817739d7f8d5f1208a3009b7be379562 (diff) | |
download | prosody-6ef7c4d80892f486d71e660b054bdfdb993c8528.tar.gz prosody-6ef7c4d80892f486d71e660b054bdfdb993c8528.zip |
Merge 0.10->trunk
Diffstat (limited to 'util-src/signal.c')
-rw-r--r-- | util-src/signal.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/util-src/signal.c b/util-src/signal.c index 1e988a2c..725555fa 100644 --- a/util-src/signal.c +++ b/util-src/signal.c @@ -32,8 +32,8 @@ #include "lua.h" #include "lauxlib.h" -#if (LUA_VERSION_NUM == 502) -#define luaL_register(L, N, R) luaL_setfuncs(L, R, 0) +#if (LUA_VERSION_NUM == 501) +#define luaL_setfuncs(L, R, N) luaL_register(L, NULL, R) #endif #ifndef lsig @@ -388,7 +388,7 @@ int luaopen_util_signal(lua_State* L) { /* add the library */ lua_newtable(L); - luaL_register(L, NULL, lsignal_lib); + luaL_setfuncs(L, lsignal_lib, 0); /* push lua_signals table into the registry */ /* put the signals inside the library table too, |