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/hashes.c | |
| parent | a9029bd099734436154fc4e794d3b958e54d1943 (diff) | |
| parent | d32f36b2817739d7f8d5f1208a3009b7be379562 (diff) | |
| download | prosody-6ef7c4d80892f486d71e660b054bdfdb993c8528.tar.gz prosody-6ef7c4d80892f486d71e660b054bdfdb993c8528.zip | |
Merge 0.10->trunk
Diffstat (limited to 'util-src/hashes.c')
| -rw-r--r-- | util-src/hashes.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/util-src/hashes.c b/util-src/hashes.c index a58a424d..ecab2e32 100644 --- a/util-src/hashes.c +++ b/util-src/hashes.c @@ -27,8 +27,8 @@ typedef unsigned __int32 uint32_t; #include <openssl/sha.h> #include <openssl/md5.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 #define HMAC_IPAD 0x36363636 @@ -213,7 +213,7 @@ static const luaL_Reg Reg[] = { LUALIB_API int luaopen_util_hashes(lua_State* L) { lua_newtable(L); - luaL_register(L, NULL, Reg); + luaL_setfuncs(L, Reg, 0);; lua_pushliteral(L, "-3.14"); lua_setfield(L, -2, "version"); return 1; |