summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authormadmaxoft <github@xoft.cz>2013-12-08 18:24:56 +0100
committermadmaxoft <github@xoft.cz>2013-12-08 18:24:56 +0100
commit4608beb3c6abca76252aa4b39bfd2e5d7fa87609 (patch)
tree009c531ab4774636d5a975b339d55b030d6cbc28 /lib
parentFixed VS2008 compilation after those huge changes. (diff)
downloadcuberite-4608beb3c6abca76252aa4b39bfd2e5d7fa87609.tar
cuberite-4608beb3c6abca76252aa4b39bfd2e5d7fa87609.tar.gz
cuberite-4608beb3c6abca76252aa4b39bfd2e5d7fa87609.tar.bz2
cuberite-4608beb3c6abca76252aa4b39bfd2e5d7fa87609.tar.lz
cuberite-4608beb3c6abca76252aa4b39bfd2e5d7fa87609.tar.xz
cuberite-4608beb3c6abca76252aa4b39bfd2e5d7fa87609.tar.zst
cuberite-4608beb3c6abca76252aa4b39bfd2e5d7fa87609.zip
Diffstat (limited to 'lib')
-rw-r--r--lib/tolua++/include/tolua++.h4
-rw-r--r--lib/tolua++/src/lib/tolua_event.h2
-rw-r--r--lib/tolua++/src/lib/tolua_map.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/lib/tolua++/include/tolua++.h b/lib/tolua++/include/tolua++.h
index 3ebd8d246..8da427fe3 100644
--- a/lib/tolua++/include/tolua++.h
+++ b/lib/tolua++/include/tolua++.h
@@ -43,8 +43,8 @@ extern "C" {
typedef int lua_Object;
-#include "../../lua/src/lua.h"
-#include "../../lua/src/lauxlib.h"
+#include "lua/src/lua.h"
+#include "lua/src/lauxlib.h"
struct tolua_Error
{
diff --git a/lib/tolua++/src/lib/tolua_event.h b/lib/tolua++/src/lib/tolua_event.h
index 898f33dfc..d6b071152 100644
--- a/lib/tolua++/src/lib/tolua_event.h
+++ b/lib/tolua++/src/lib/tolua_event.h
@@ -15,7 +15,7 @@
#ifndef TOLUA_EVENT_H
#define TOLUA_EVENT_H
-#include "tolua++.h"
+#include "../../include/tolua++.h"
TOLUA_API void tolua_moduleevents (lua_State* L);
TOLUA_API int tolua_ismodulemetatable (lua_State* L);
diff --git a/lib/tolua++/src/lib/tolua_map.c b/lib/tolua++/src/lib/tolua_map.c
index 7c4a22336..937229610 100644
--- a/lib/tolua++/src/lib/tolua_map.c
+++ b/lib/tolua++/src/lib/tolua_map.c
@@ -25,7 +25,7 @@
/* Create metatable
* Create and register new metatable
*/
-static int tolua_newmetatable (lua_State* L, char* name)
+static int tolua_newmetatable (lua_State* L, const char * name)
{
int r = luaL_newmetatable(L,name);