elua: elua_report_error now takes Elua_State*

2 files changed, 6 insertions, 5 deletions

diff --git a/src/lib/elua/Elua.h b/src/lib/elua/Elua.h
index 2f1f41af68..623c9925b8 100644
--- a/src/lib/elua/Elua.h
+++ b/src/lib/elua/Elua.h
@@ -71,7 +71,7 @@ EAPI void elua_state_free(Elua_State *state);
 
 EAPI Elua_State *elua_state_from_lua_get(lua_State *L);
 
-EAPI int elua_report_error(lua_State *L, const char *pname, int status);
+EAPI int elua_report_error(Elua_State *es, const char *pname, int status);
 
 EAPI void elua_state_setup_i18n(lua_State *L);
 
diff --git a/src/lib/elua/elua.c b/src/lib/elua/elua.c
index bdd5606fed..957d4e4bbe 100644
--- a/src/lib/elua/elua.c
+++ b/src/lib/elua/elua.c
@@ -106,13 +106,14 @@ _elua_errmsg(const char *pname, const char *msg)
 }
 
 EAPI int
-elua_report_error(lua_State *L, const char *pname, int status)
+elua_report_error(Elua_State *es, const char *pname, int status)
 {
-   if (status && !lua_isnil(L, -1))
+   if (!es || !es->luastate) return status;
+   if (status && !lua_isnil(es->luastate, -1))
      {
-        const char *msg = lua_tostring(L, -1);
+        const char *msg = lua_tostring(es->luastate, -1);
         _elua_errmsg(pname, msg ? msg : "(non-string error)");
-        lua_pop(L, 1);
+        lua_pop(es->luastate, 1);
      }
    return status;
 }