From ecc8ffbd8033724b026f10ab435f7054c37f145d Mon Sep 17 00:00:00 2001
From: Tiger Wang <ziwei.tiger@outlook.com>
Date: Wed, 23 Jun 2021 13:59:01 +0100
Subject: Compile the entire Lua stack as C++

* Fixes #5216
---
 src/Bindings/LuaState.cpp  | 19 +++++--------------
 src/Bindings/LuaState.h    |  5 +----
 src/Bindings/PluginLua.cpp |  5 +----
 3 files changed, 7 insertions(+), 22 deletions(-)

(limited to 'src/Bindings')

diff --git a/src/Bindings/LuaState.cpp b/src/Bindings/LuaState.cpp
index 3a1379df1..e4c537967 100644
--- a/src/Bindings/LuaState.cpp
+++ b/src/Bindings/LuaState.cpp
@@ -6,10 +6,7 @@
 #include "Globals.h"
 #include "LuaState.h"
 
-extern "C"
-{
-	#include "lua/src/lualib.h"
-}
+#include "lua/src/lualib.h"
 
 #undef TOLUA_TEMPLATE_BIND
 #include "tolua++/include/tolua++.h"
@@ -34,17 +31,11 @@ extern "C"
 
 
 
-// fwd: "SQLite/lsqlite3.c"
-extern "C"
-{
-	int luaopen_lsqlite3(lua_State * L);
-}
+// fwd: "SQLite/lsqlite3.cpp"
+int luaopen_lsqlite3(lua_State * L);
 
-// fwd: "LuaExpat/lxplib.c":
-extern "C"
-{
-	int luaopen_lxp(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 420fdad69..d579369f0 100644
--- a/src/Bindings/LuaState.h
+++ b/src/Bindings/LuaState.h
@@ -30,10 +30,7 @@ stays valid but doesn't call into Lua code anymore, returning false for "failure
 
 #pragma once
 
-extern "C"
-{
-	#include "lua/src/lauxlib.h"
-}
+#include "lua/src/lauxlib.h"
 
 #include "../Defines.h"
 #include "../FunctionRef.h"
diff --git a/src/Bindings/PluginLua.cpp b/src/Bindings/PluginLua.cpp
index 9b6bccf7c..887e6d699 100644
--- a/src/Bindings/PluginLua.cpp
+++ b/src/Bindings/PluginLua.cpp
@@ -18,10 +18,7 @@
 #include "../Root.h"
 #include "../WebAdmin.h"
 
-extern "C"
-{
-	#include "lua/src/lauxlib.h"
-}
+#include "lua/src/lauxlib.h"
 
 #undef TOLUA_TEMPLATE_BIND
 #include "tolua++/include/tolua++.h"
-- 
cgit v1.2.3