From: Siavash Tavakoli <siavash.tavakoli@open-xchange.com>
Date: Wed, 18 Aug 2021 12:54:39 +0000 (+0100)
Subject: lib-lua: Don't include lua_resume_compat() for 5.1
X-Git-Tag: 2.3.17~182
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=16deb5b8bc4c1648ef6ae3c5d6f9f79f307ef6c3;p=thirdparty%2Fdovecot%2Fcore.git

lib-lua: Don't include lua_resume_compat() for 5.1

lua_resume() is not supported in 5.1, so don't try to add a
compatibility function that fails compilation.
---

diff --git a/src/lib-lua/dlua-compat.c b/src/lib-lua/dlua-compat.c
index 94f27bac4b..c676186258 100644
--- a/src/lib-lua/dlua-compat.c
+++ b/src/lib-lua/dlua-compat.c
@@ -147,7 +147,7 @@ lua_Integer lua_tointegerx(lua_State *L, int idx, int *isnum_r)
 }
 #endif
 
-#if LUA_VERSION_NUM < 504
+#if LUA_VERSION_NUM > 501 && LUA_VERSION_NUM < 504
 #  undef lua_resume
 int lua_resume_compat(lua_State *L, lua_State *from, int nargs, int *nresults)
 {
diff --git a/src/lib-lua/dlua-compat.h b/src/lib-lua/dlua-compat.h
index 307ae467b8..052bb838d4 100644
--- a/src/lib-lua/dlua-compat.h
+++ b/src/lib-lua/dlua-compat.h
@@ -56,7 +56,7 @@ void lua_seti(lua_State *L, int index, lua_Integer n);
 lua_Integer lua_tointegerx(lua_State *L, int idx, int *isnum_r);
 #endif
 
-#if LUA_VERSION_NUM < 504
+#if LUA_VERSION_NUM > 501 && LUA_VERSION_NUM < 504
 /*
  * lua_resume() compatibility function. Lua 5.4 expects an extra "nresults"
  * argeument.