projects
/
prosody.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge 0.10->trunk
[prosody.git]
/
util-src
/
encodings.c
diff --git
a/util-src/encodings.c
b/util-src/encodings.c
index c00b2267e06bb5b53f69c6a9d64e68520227d008..35677095181fbf990c2c56a61527442e9009bcbf 100644
(file)
--- a/
util-src/encodings.c
+++ b/
util-src/encodings.c
@@
-21,8
+21,8
@@
#include "lua.h"
#include "lauxlib.h"
#include "lua.h"
#include "lauxlib.h"
-#if (LUA_VERSION_NUM == 50
2
)
-#define luaL_
register(L, N, R) luaL_setfuncs(L, R, 0
)
+#if (LUA_VERSION_NUM == 50
1
)
+#define luaL_
setfuncs(L, R, N) luaL_register(L, NULL, R
)
#endif
/***************** BASE64 *****************/
#endif
/***************** BASE64 *****************/
@@
-530,19
+530,19
@@
LUALIB_API int luaopen_util_encodings(lua_State* L) {
lua_newtable(L);
lua_newtable(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);
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);
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);
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");
lua_setfield(L, -2, "utf8");
lua_pushliteral(L, "-3.14");