summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorPixel <pixel@nobis-crew.org>2009-11-10 10:01:30 -0800
committerPixel <pixel@nobis-crew.org>2009-11-10 10:01:30 -0800
commitf85b3a5e5af39cb39287ecb63ecbd09d6f714b6d (patch)
treefd53e4f88dfa771c30b36d7c13a6fc17e3af6f1b /include
parent75409abcbdeb9de115b14725263b427bbedf0cc4 (diff)
parent0a8b9c1a3d054fa95ca76131b7422ee9f25bd4f9 (diff)
Merge branch 'master' of ssh+git://pixel@git.grumpycoder.net/pub/repo.git/Baltisot
Diffstat (limited to 'include')
-rw-r--r--include/BLua.h12
1 files changed, 2 insertions, 10 deletions
diff --git a/include/BLua.h b/include/BLua.h
index 2afcdef..49573e3 100644
--- a/include/BLua.h
+++ b/include/BLua.h
@@ -25,15 +25,10 @@
struct lua_State;
extern "C" {
- void do_lua_lock(lua_State *);
- void do_lua_unlock(lua_State *);
-}
-
-#define lua_lock(L) do_lua_lock(L)
-#define lua_unlock(L) do_lua_unlock(L)
-
#include <lua.h>
#include <lauxlib.h>
+}
+
#include <map>
#include <Exceptions.h>
#include <Handle.h>
@@ -147,9 +142,6 @@ class Lua : public Base {
void do_break();
- virtual void lock();
- virtual void unlock();
-
bool is_protected();
void openlib(const String & libname, const struct luaL_reg *l, int nup);