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 | 80c7d5155e9c468d86f3b268e90303decd7d1827 (patch) | |
| tree | 103fd7d9396b60b9f76071a009c54d3ca9d35744 /util-src/encodings.c | |
| parent | f1313996a2db339fe76f269353cc911c68316f30 (diff) | |
| parent | c5e4af96d8bd9de7a96d3dc1eff5b8d1eecbfdaf (diff) | |
| download | prosody-80c7d5155e9c468d86f3b268e90303decd7d1827.tar.gz prosody-80c7d5155e9c468d86f3b268e90303decd7d1827.zip | |
Merge 0.10->trunk
Diffstat (limited to 'util-src/encodings.c')
| -rw-r--r-- | util-src/encodings.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/util-src/encodings.c b/util-src/encodings.c index c00b2267..35677095 100644 --- a/util-src/encodings.c +++ b/util-src/encodings.c @@ -21,8 +21,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 /***************** BASE64 *****************/ @@ -530,19 +530,19 @@ LUALIB_API int luaopen_util_encodings(lua_State* L) { lua_newtable(L); lua_newtable(L); - luaL_register(L, NULL, Reg_base64); + luaL_setfuncs(L, Reg_base64, 0); lua_setfield(L, -2, "base64"); lua_newtable(L); - luaL_register(L, NULL, Reg_stringprep); + luaL_setfuncs(L, Reg_stringprep, 0); lua_setfield(L, -2, "stringprep"); lua_newtable(L); - luaL_register(L, NULL, Reg_idna); + luaL_setfuncs(L, Reg_idna, 0); lua_setfield(L, -2, "idna"); lua_newtable(L); - luaL_register(L, NULL, Reg_utf8); + luaL_setfuncs(L, Reg_utf8, 0); lua_setfield(L, -2, "utf8"); lua_pushliteral(L, "-3.14"); |