diff options
| author | Thorbjørn Lindeijer <bjorn@lindeijer.nl> | 2015-06-07 22:12:28 +0200 |
|---|---|---|
| committer | Thorbjørn Lindeijer <bjorn@lindeijer.nl> | 2015-06-07 22:12:38 +0200 |
| commit | caf61e7ebc7b3b92b49f9f41e4848063fa15f453 (patch) | |
| tree | 09a8a0d242d7a2fc4b0960697a80ccfc584300d2 /src | |
| parent | 441ff982764017c26ae2b1ae474e5ac91f3a1d7c (diff) | |
| download | manaserv-caf61e7ebc7b3b92b49f9f41e4848063fa15f453.tar.gz manaserv-caf61e7ebc7b3b92b49f9f41e4848063fa15f453.tar.bz2 manaserv-caf61e7ebc7b3b92b49f9f41e4848063fa15f453.tar.xz manaserv-caf61e7ebc7b3b92b49f9f41e4848063fa15f453.zip | |
Fixed compile when using Lua 5.3
It seems like properly upgrading to Lua 5.3 would affect quite a few
small function calls, but fortunately compatibility can be achieved with
just a define for now.
Diffstat (limited to 'src')
| -rw-r--r-- | src/scripting/lua.cpp | 5 | ||||
| -rw-r--r-- | src/scripting/luautil.h | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/scripting/lua.cpp b/src/scripting/lua.cpp index a6a68cf4..0a198da3 100644 --- a/src/scripting/lua.cpp +++ b/src/scripting/lua.cpp @@ -22,11 +22,6 @@ #include <cassert> -extern "C" { -#include <lualib.h> -#include <lauxlib.h> -} - #include "common/defines.h" #include "common/resourcemanager.h" #include "game-server/accountconnection.h" diff --git a/src/scripting/luautil.h b/src/scripting/luautil.h index e38b01c8..46a07713 100644 --- a/src/scripting/luautil.h +++ b/src/scripting/luautil.h @@ -24,6 +24,9 @@ #include "scripting/script.h" extern "C" { +// Quick and dirty compatibility with Lua 5.3 +#define LUA_COMPAT_APIINTCASTS + #include <lualib.h> #include <lauxlib.h> } |