summaryrefslogtreecommitdiffstats
path: root/src/Bindings/LuaState.cpp
diff options
context:
space:
mode:
authorTycho <work.tycho+git@gmail.com>2014-04-02 15:54:57 +0200
committerTycho <work.tycho+git@gmail.com>2014-04-02 15:54:57 +0200
commitb449ad861310b6ec26a877835877730c8f11ad2c (patch)
treebd02fc5cbaceab7f7db1e24c95e78b22e6c39607 /src/Bindings/LuaState.cpp
parentMerge branch 'master' into globals (diff)
parentMore fixes to get it to compile for me on Mac 10.9. Mostly just newline additions, but some of the unused variables were causing errors, so I wrapped them in #ifndef __APPLE__ calls, since I didn't know if they were going to be used in the future. (diff)
downloadcuberite-b449ad861310b6ec26a877835877730c8f11ad2c.tar
cuberite-b449ad861310b6ec26a877835877730c8f11ad2c.tar.gz
cuberite-b449ad861310b6ec26a877835877730c8f11ad2c.tar.bz2
cuberite-b449ad861310b6ec26a877835877730c8f11ad2c.tar.lz
cuberite-b449ad861310b6ec26a877835877730c8f11ad2c.tar.xz
cuberite-b449ad861310b6ec26a877835877730c8f11ad2c.tar.zst
cuberite-b449ad861310b6ec26a877835877730c8f11ad2c.zip
Diffstat (limited to 'src/Bindings/LuaState.cpp')
-rw-r--r--src/Bindings/LuaState.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/Bindings/LuaState.cpp b/src/Bindings/LuaState.cpp
index 13eb17f7d..a33459ad2 100644
--- a/src/Bindings/LuaState.cpp
+++ b/src/Bindings/LuaState.cpp
@@ -11,6 +11,7 @@ extern "C"
#include "lua/src/lualib.h"
}
+#undef TOLUA_TEMPLATE_BIND
#include "tolua++/include/tolua++.h"
#include "Bindings.h"
#include "ManualBindings.h"