From 1b5c5320d198a5d541925a153d7723aca60fbedd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Vavru=C5=A1a?= <marek.vavrusa@nic.cz>
Date: Wed, 8 Apr 2015 16:22:44 +0200
Subject: [PATCH] daemon: unified Lua version checks
---
daemon/bindings.c | 8 ++++----
daemon/engine.c | 6 +++---
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/daemon/bindings.c b/daemon/bindings.c
index 5ed40a3c4..cbb181837 100644
--- a/daemon/bindings.c
+++ b/daemon/bindings.c
@@ -20,14 +20,14 @@
#include "daemon/bindings.h"
/** @internal Compatibility wrapper for Lua 5.0 - 5.2 */
-#if LUA_VERSION_NUM < 502
+#if LUA_VERSION_NUM >= 502
+#define register_lib(L, name, lib) \
+ luaL_newlib((L), (lib))
+#else
#define lua_rawlen(L, obj) \
lua_objlen((L), (obj))
#define register_lib(L, name, lib) \
luaL_openlib((L), (name), (lib), 0)
-#else
-#define register_lib(L, name, lib) \
- luaL_newlib((L), (lib))
#endif
/** List loaded modules */
diff --git a/daemon/engine.c b/daemon/engine.c
index 791936d32..401140790 100644
--- a/daemon/engine.c
+++ b/daemon/engine.c
@@ -321,11 +321,11 @@ int engine_unregister(struct engine *engine, const char *name)
void engine_lualib(struct engine *engine, const char *name, lua_CFunction lib_cb)
{
if (engine != NULL) {
-#if LUA_VERSION_NUM < 502
- lib_cb(engine->L);
-#else
+#if LUA_VERSION_NUM >= 502
luaL_requiref(engine->L, name, lib_cb, 1);
lua_pop(engine->L, 1);
+#else
+ lib_cb(engine->L);
#endif
}
}
--
GitLab