LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-15 15:51:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 12.0-development

Browse Source
This commit is contained in:
Alex Szpakowski
2020-09-21 22:35:19 -03:00
parent 0fa0d39a5d 6be79bdd89
commit 26326a01e0
8 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/runtime.cpp
+4 -2
View File
@@ -1134,9 +1134,11 @@ Type *luax_type(lua_State *L, int idx)
return Type::byName(luaL_checkstring(L, idx));
}
int luax_resume(lua_State *L, int nargs)
int luax_resume(lua_State *L, int nargs, int* nres)
{
#if LUA_VERSION_NUM >= 502
#if LUA_VERSION_NUM >= 504
return lua_resume(L, nullptr, nargs, nres);
#elif LUA_VERSION_NUM >= 502
return lua_resume(L, nullptr, nargs);
#else
return lua_resume(L, nargs);
src/common/runtime.h
+1 -1
View File
@@ -709,7 +709,7 @@ int luax_catchexcept(lua_State *L, const T& func, const F& finallyfunc)
* Compatibility shim for lua_resume
* Exported because it's used in the launcher
**/
LOVE_EXPORT int luax_resume(lua_State *L, int nargs);
LOVE_EXPORT int luax_resume(lua_State *L, int nargs, int* nres);
} // love