# HG changeset patch
# User Bart van Strien <bart.bes+projects@gmail.com>
# Date 1525370656 -7200
# Node ID 6724986f3935b8373319067e99400a681a18cfc3
# Parent a95b5df234f888dcf751f3fb3a39783a7bb67b5f
Restore lua 5.2/5.3 compatibility (fixes #1408)
diff --git a/src/common/runtime.cpp b/src/common/runtime.cpp
--- a/src/common/runtime.cpp
+++ b/src/common/runtime.cpp
@@ -879,4 +879,13 @@
return Type::byName(luaL_checkstring(L, idx));
}
+int luax_resume(lua_State *L, int nargs)
+{
+#if LUA_VERSION_NUM >= 502
+ return lua_resume(L, nullptr, nargs);
+#else
+ return lua_resume(L, nargs);
+#endif
+}
+
} // love
diff --git a/src/common/runtime.h b/src/common/runtime.h
--- a/src/common/runtime.h
+++ b/src/common/runtime.h
@@ -676,6 +676,11 @@
return 0;
}
+/**
+ * Compatibility shim for lua_resume
+ **/
+int luax_resume(lua_State *L, int nargs);
+
} // love
#endif // LOVE_RUNTIME_H
diff --git a/src/love.cpp b/src/love.cpp
--- a/src/love.cpp
+++ b/src/love.cpp
@@ -19,6 +19,7 @@
**/
#include "common/version.h"
+#include "common/runtime.h"
#include "modules/love/love.h"
#include <SDL.h>
@@ -214,7 +215,7 @@
lua_newthread(L);
lua_pushvalue(L, -2);
int stackpos = lua_gettop(L);
- while (lua_resume(L, 0) == LUA_YIELD)
+ while (love::luax_resume(L, 0) == LUA_YIELD)
lua_pop(L, lua_gettop(L) - stackpos);
retval = 0;