commit f0d7200: [Minor] Restore Lua 5.2 compatibility

Vsevolod Stakhov vsevolod at highsecure.ru
Mon Apr 1 11:49:03 UTC 2019


Author: Vsevolod Stakhov
Date: 2019-04-01 12:44:42 +0100
URL: https://github.com/rspamd/rspamd/commit/f0d72001587ab4027a90abd89d1895b73754f010 (HEAD -> master)

[Minor] Restore Lua 5.2 compatibility
Issue: #2826
Closes: #2826

---
 src/lua/lua_thread_pool.c              | 2 +-
 test/rspamd_lua_pcall_vs_resume_test.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/lua/lua_thread_pool.c b/src/lua/lua_thread_pool.c
index d10f64579..3d289a12e 100644
--- a/src/lua/lua_thread_pool.c
+++ b/src/lua/lua_thread_pool.c
@@ -236,7 +236,7 @@ static gint
 lua_do_resume_full (lua_State *L, gint narg, const gchar *loc)
 {
 	msg_debug_lua_threads ("%s: lua_do_resume_full", loc);
-#if LUA_VERSION_NUM < 503
+#if LUA_VERSION_NUM < 502
 	return lua_resume (L, narg);
 #else
 	return lua_resume (L, NULL, narg);
diff --git a/test/rspamd_lua_pcall_vs_resume_test.c b/test/rspamd_lua_pcall_vs_resume_test.c
index 8252dffb0..6cb05fd38 100644
--- a/test/rspamd_lua_pcall_vs_resume_test.c
+++ b/test/rspamd_lua_pcall_vs_resume_test.c
@@ -53,7 +53,7 @@ test_resume(lua_State *L, gint function_call)
 
 	for (i = 0; i < N; i ++) {
 		lua_rawgeti (L, LUA_REGISTRYINDEX, function_call);
-#if LUA_VERSION_NUM < 503
+#if LUA_VERSION_NUM < 502
 		lua_resume (L, 0);
 #else
 		lua_resume (L, NULL, 0);
@@ -79,7 +79,7 @@ test_resume_get_thread(gint function_call)
 		ent = lua_thread_pool_get_for_config (rspamd_main->cfg);
 
 		lua_rawgeti (ent->lua_state, LUA_REGISTRYINDEX, function_call);
-#if LUA_VERSION_NUM < 503
+#if LUA_VERSION_NUM < 502
 		lua_resume (ent->lua_state, 0);
 #else
 		lua_resume (ent->lua_state, NULL, 0);
@@ -107,7 +107,7 @@ test_resume_get_new_thread(gint function_call)
 		ent = lua_thread_pool_get_for_task (rspamd_main->cfg->lua_thread_pool);
 
 		lua_rawgeti (ent->lua_state, LUA_REGISTRYINDEX, function_call);
-#if LUA_VERSION_NUM < 503
+#if LUA_VERSION_NUM < 502
 		lua_resume (ent->lua_state, 0);
 #else
 		lua_resume (ent->lua_state, NULL, 0);


More information about the Commits mailing list