From ba1c2357af62a61e8084d77783868a10815b8556 Mon Sep 17 00:00:00 2001 From: Přemysl Eric Janouch Date: Wed, 2 Sep 2020 19:05:20 +0200 Subject: degesch: fix Lua 5.4 build Not sure about how well it works yet. Lua 5.3 is still made preferential by the order of pkgconfig lookup. --- degesch.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'degesch.c') diff --git a/degesch.c b/degesch.c index 5afd49c..5ba7a42 100644 --- a/degesch.c +++ b/degesch.c @@ -9646,12 +9646,19 @@ lua_task_resume (struct lua_task *self, int index) n = 2; } +#if LUA_VERSION_NUM >= 504 + int nresults = 0; + int res = lua_resume (L, NULL, n, &nresults); +#else int res = lua_resume (L, NULL, n); + int nresults = lua_gettop (L); +#endif + struct error *error = NULL; if (res == LUA_YIELD) { // AFAIK we don't get any good error context information from here - if (lua_task_schedule (self, lua_gettop (L), &error)) + if (lua_task_schedule (self, nresults, &error)) return; } // For simplicity ignore any results from successful returns -- cgit v1.2.3-54-g00ecf