Fix rebase

EdgeTX · Oct 1, 2024 · 36a878f · 36a878f
1 parent 2f51356
commit 36a878f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/radio/src/gui/colorlcd/standalone_lua.cpp b/radio/src/gui/colorlcd/standalone_lua.cpp
@@ -58,7 +58,7 @@ static void luaStandaloneInit()
   lsStandaloneTrace.script = "lua_newstate(scripts)";
   lsStandalone = lua_newstate(tracer_alloc, &lsStandaloneTrace);   //we use tracer allocator
 #else
-  lsStandalone = lua_newstate(l_alloc, nullptr);   //we use Lua default allocator
+  lsStandalone = luaL_newstate();   //we use Lua default allocator
 #endif
   if (lsStandalone) {
     // install our panic handler

diff --git a/radio/src/lua/lua_api.h b/radio/src/lua/lua_api.h
@@ -26,6 +26,9 @@
 // prevent C++ code to be included from lua.h
 #include "rtos.h"
 
+extern "C" {
+  #include "lua.h"
+};
 
 #include "dataconstants.h"
 #include "edgetx_types.h"

diff --git a/radio/src/lua/lua_lvgl_widget.cpp b/radio/src/lua/lua_lvgl_widget.cpp
@@ -31,8 +31,7 @@
 
 //-----------------------------------------------------------------------------
 
-static int pcallcont (lua_State *L) {
-  int status = lua_getctx(L, NULL);
+static int pcallcont (lua_State *L, int status, lua_KContext extra) {
   return status == LUA_OK;
 }