util-src/*.c: Invert Lua 5.2 compat to be 5.2+ by default and a macro to support 5.1
--- a/util-src/encodings.c Wed Apr 08 00:45:26 2015 +0200
+++ b/util-src/encodings.c Sun Apr 26 12:38:37 2015 +0200
@@ -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 @@
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");
--- a/util-src/hashes.c Wed Apr 08 00:45:26 2015 +0200
+++ b/util-src/hashes.c Sun Apr 26 12:38:37 2015 +0200
@@ -27,8 +27,8 @@
#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 @@
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;
--- a/util-src/net.c Wed Apr 08 00:45:26 2015 +0200
+++ b/util-src/net.c Sun Apr 26 12:38:37 2015 +0200
@@ -26,8 +26,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
/* Enumerate all locally configured IP addresses */
@@ -131,6 +131,6 @@
};
lua_newtable(L);
- luaL_register(L, NULL, exports);
+ luaL_setfuncs(L, exports, 0);
return 1;
}
--- a/util-src/pposix.c Wed Apr 08 00:45:26 2015 +0200
+++ b/util-src/pposix.c Sun Apr 26 12:38:37 2015 +0200
@@ -35,8 +35,8 @@
#include "lualib.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
#include <fcntl.h>
@@ -803,7 +803,7 @@
};
lua_newtable(L);
- luaL_register(L, NULL, exports);
+ luaL_setfuncs(L, exports, 0);
lua_pushliteral(L, "pposix");
lua_setfield(L, -2, "_NAME");
--- a/util-src/signal.c Wed Apr 08 00:45:26 2015 +0200
+++ b/util-src/signal.c Sun Apr 26 12:38:37 2015 +0200
@@ -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 @@
/* 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,
--- a/util-src/windows.c Wed Apr 08 00:45:26 2015 +0200
+++ b/util-src/windows.c Sun Apr 26 12:38:37 2015 +0200
@@ -19,8 +19,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
static int Lget_nameservers(lua_State* L) {
@@ -104,7 +104,7 @@
LUALIB_API int luaopen_util_windows(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;