8 files changed, 25 insertions, 5 deletions

diff --git a/lib/lua b/lib/lua
-Subproject f543fd79318bf31c81141a07662eb71896a1d93
+Subproject 9972ba6d45f572b3569f907421fbc4866b4d1bf
diff --git a/lib/sqlite b/lib/sqlite
-Subproject 9aeab26b00c0bf4c1c3d0afd61acaf08eaf949d
+Subproject 4435d7e4297220228174385302d430f1fdf3d09
diff --git a/lib/tolua++ b/lib/tolua++
-Subproject 26e85c404baf1d2e5eb4a21660d1f37176d7ab3
+Subproject 4d24aa316898964c23896fbb7419bdaa23638c2
diff --git a/src/Bindings/DeprecatedBindings.cpp b/src/Bindings/DeprecatedBindings.cpp
index d46d565bd..783f308a7 100644
--- a/src/Bindings/DeprecatedBindings.cpp
+++ b/src/Bindings/DeprecatedBindings.cpp
@@ -2,6 +2,11 @@
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
 #include "DeprecatedBindings.h"
+extern "C"
+{
+	#include "lua/src/lua.h"
+	#include "lua/src/lauxlib.h"
+}
 #undef TOLUA_TEMPLATE_BIND
 #include "tolua++/include/tolua++.h"
 
diff --git a/src/Bindings/LuaState.cpp b/src/Bindings/LuaState.cpp
index 3d65045dd..08d2b8b2e 100644
--- a/src/Bindings/LuaState.cpp
+++ b/src/Bindings/LuaState.cpp
@@ -6,7 +6,10 @@
 #include "Globals.h"
 #include "LuaState.h"
 
-#include "lua/src/lualib.h"
+extern "C"
+{
+	#include "lua/src/lualib.h"
+}
 
 #undef TOLUA_TEMPLATE_BIND
 #include "tolua++/include/tolua++.h"
@@ -32,7 +35,10 @@
 
 
 // fwd: "SQLite/lsqlite3.cpp"
-int luaopen_lsqlite3(lua_State * L);
+extern "C"
+{
+	int luaopen_lsqlite3(lua_State * L);
+}
 
 // fwd: "LuaExpat/lxplib.cpp":
 int luaopen_lxp(lua_State * L);
diff --git a/src/Bindings/LuaState.h b/src/Bindings/LuaState.h
index 64e6cbe82..27b2990a6 100644
--- a/src/Bindings/LuaState.h
+++ b/src/Bindings/LuaState.h
@@ -30,7 +30,10 @@ stays valid but doesn't call into Lua code anymore, returning false for "failure
 
 #pragma once
 
-#include "lua/src/lauxlib.h"
+extern "C"
+{
+	#include "lua/src/lauxlib.h"
+}
 
 #include "../Defines.h"
 #include "../FunctionRef.h"
diff --git a/src/Bindings/LuaWindow.cpp b/src/Bindings/LuaWindow.cpp
index eb4187887..073b8c21e 100644
--- a/src/Bindings/LuaWindow.cpp
+++ b/src/Bindings/LuaWindow.cpp
@@ -7,7 +7,10 @@
 #include "../Entities/Player.h"
 #include "../UI/SlotArea.h"
 #include "PluginLua.h"
-#include "lua/src/lauxlib.h"  // Needed for LUA_REFNIL
+extern "C"
+{
+	#include "lua/src/lauxlib.h"  // Needed for LUA_REFNIL
+}
 #include "../Root.h"
 #include "../ClientHandle.h"
 
diff --git a/src/Bindings/PluginLua.cpp b/src/Bindings/PluginLua.cpp
index 41e2e14f7..e218fcd06 100644
--- a/src/Bindings/PluginLua.cpp
+++ b/src/Bindings/PluginLua.cpp
@@ -20,7 +20,10 @@
 #include "../Root.h"
 #include "../WebAdmin.h"
 
-#include "lua/src/lauxlib.h"
+extern "C"
+{
+	#include "lua/src/lauxlib.h"
+}
 
 #undef TOLUA_TEMPLATE_BIND
 #include "tolua++/include/tolua++.h"