aboutsummaryrefslogtreecommitdiff
path: root/engines/sword25/util/lua
diff options
context:
space:
mode:
authorMax Horn2013-04-18 17:09:32 +0200
committerMax Horn2013-04-18 17:09:32 +0200
commit4a55f5281826ecce1e7648b7b3e74105a25cae85 (patch)
tree5315973c565a9c07679187257c283409fb790419 /engines/sword25/util/lua
parent2b8cb1c1f09d1e7b946cff3d6320da8026208e6e (diff)
downloadscummvm-rg350-4a55f5281826ecce1e7648b7b3e74105a25cae85.tar.gz
scummvm-rg350-4a55f5281826ecce1e7648b7b3e74105a25cae85.tar.bz2
scummvm-rg350-4a55f5281826ecce1e7648b7b3e74105a25cae85.zip
SWORD25: Silence warning in the Lua code
This fixes warnings like this that crop up when compiling sword25 with Apple clang 4.2 (clang-425.0.28) (based on LLVM 3.2svn)
Diffstat (limited to 'engines/sword25/util/lua')
-rw-r--r--engines/sword25/util/lua/ldo.cpp10
-rw-r--r--engines/sword25/util/lua/lua.h10
2 files changed, 10 insertions, 10 deletions
diff --git a/engines/sword25/util/lua/ldo.cpp b/engines/sword25/util/lua/ldo.cpp
index c162a62e98..a230097f2a 100644
--- a/engines/sword25/util/lua/ldo.cpp
+++ b/engines/sword25/util/lua/ldo.cpp
@@ -98,6 +98,16 @@ static void resetstack (lua_State *L, int status) {
}
+// Added in ScummVM. Refer to http://www.lua.org/manual/5.1/manual.html
+static const char* luaErrorDescription[] = {
+ "No error",
+ "Coroutine yield", // not an actual error, see lua_resume
+ "Runtime error",
+ "Syntax error during pre-compilation", // refer to lua_load
+ "Memory allocation error",
+ "Error while running the error handler function"
+};
+
void luaD_throw (lua_State *L, int errcode) {
if (L->errorJmp) {
L->errorJmp->status = errcode;
diff --git a/engines/sword25/util/lua/lua.h b/engines/sword25/util/lua/lua.h
index 768ec1ad74..a3b7573ca5 100644
--- a/engines/sword25/util/lua/lua.h
+++ b/engines/sword25/util/lua/lua.h
@@ -48,16 +48,6 @@
#define LUA_ERRMEM 4
#define LUA_ERRERR 5
-// Added in ScummVM. Refer to http://www.lua.org/manual/5.1/manual.html
-static const char* luaErrorDescription[] = {
- "No error",
- "Coroutine yield", // not an actual error, see lua_resume
- "Runtime error",
- "Syntax error during pre-compilation", // refer to lua_load
- "Memory allocation error",
- "Error while running the error handler function"
-};
-
typedef struct lua_State lua_State;
typedef int (*lua_CFunction) (lua_State *L);