From 5f5b287b4548cb21fde9ae451392d82e64cc5de7 Mon Sep 17 00:00:00 2001
From: Benoit Germain <benoit.germain@ubisoft.com>
Date: Tue, 11 Jun 2024 16:58:33 +0200
Subject: All Lua headers included just once in _pch.h

---
 src/_pch.h             | 11 +++++++++++
 src/cancel.h           | 11 -----------
 src/compat.h           | 11 -----------
 src/deep.h             |  9 ---------
 src/keeper.h           |  9 ---------
 src/lanes.h            |  9 ---------
 src/luaerrors.h        | 11 -----------
 src/macros_and_utils.h | 11 -----------
 src/universe.h         |  9 ---------
 9 files changed, 11 insertions(+), 80 deletions(-)

diff --git a/src/_pch.h b/src/_pch.h
index 67fe4a7..a7de846 100644
--- a/src/_pch.h
+++ b/src/_pch.h
@@ -20,3 +20,14 @@
 #include <tuple>
 #include <type_traits>
 #include <variant>
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif // __cplusplus
+#include "lua.h"
+#include "lualib.h"
+#include "lauxlib.h"
+#ifdef __cplusplus
+}
+#endif // __cplusplus
diff --git a/src/cancel.h b/src/cancel.h
index df3cfad..3304e0d 100644
--- a/src/cancel.h
+++ b/src/cancel.h
@@ -1,16 +1,5 @@
 #pragma once
 
-#ifdef __cplusplus
-extern "C"
-{
-#endif // __cplusplus
-#include "lua.h"
-#include "lualib.h"
-#include "lauxlib.h"
-#ifdef __cplusplus
-}
-#endif // __cplusplus
-
 #include "macros_and_utils.h"
 #include "uniquekey.h"
 
diff --git a/src/compat.h b/src/compat.h
index e0a2e6f..6458307 100644
--- a/src/compat.h
+++ b/src/compat.h
@@ -1,16 +1,5 @@
 #pragma once
 
-#ifdef __cplusplus
-extern "C"
-{
-#endif // __cplusplus
-#include "lua.h"
-#include "lualib.h"
-#include "lauxlib.h"
-#ifdef __cplusplus
-}
-#endif // __cplusplus
-
 #include "debug.h"
 
 // try to detect if we are building against LuaJIT or MoonJIT
diff --git a/src/deep.h b/src/deep.h
index 6cb9bd6..fb62276 100644
--- a/src/deep.h
+++ b/src/deep.h
@@ -5,15 +5,6 @@
  * said modules can either link against lanes, or embed compat.cpp/h deep.cpp/h tools.cpp/h universe.cpp/h
  */
 
-#ifdef __cplusplus
-extern "C"
-{
-#endif // __cplusplus
-#include "lua.h"
-#ifdef __cplusplus
-}
-#endif // __cplusplus
-
 #include "lanesconf.h"
 #include "uniquekey.h"
 
diff --git a/src/keeper.h b/src/keeper.h
index 9c08c26..1ad84d7 100644
--- a/src/keeper.h
+++ b/src/keeper.h
@@ -1,14 +1,5 @@
 #pragma once
 
-#ifdef __cplusplus
-extern "C"
-{
-#endif // __cplusplus
-#include "lua.h"
-#ifdef __cplusplus
-}
-#endif // __cplusplus
-
 #include "uniquekey.h"
 
 // forwards
diff --git a/src/lanes.h b/src/lanes.h
index e697406..925db59 100644
--- a/src/lanes.h
+++ b/src/lanes.h
@@ -1,14 +1,5 @@
 #pragma once
 
-#ifdef __cplusplus
-extern "C"
-{
-#endif // __cplusplus
-#include "lua.h"
-#ifdef __cplusplus
-}
-#endif // __cplusplus
-
 #include "lanesconf.h"
 
 #define LANES_VERSION_MAJOR 4
diff --git a/src/luaerrors.h b/src/luaerrors.h
index ff72582..7bc08da 100644
--- a/src/luaerrors.h
+++ b/src/luaerrors.h
@@ -1,16 +1,5 @@
 #pragma once
 
-#ifdef __cplusplus
-extern "C"
-{
-#endif // __cplusplus
-#include "lua.h"
-#include "lualib.h"
-#include "lauxlib.h"
-#ifdef __cplusplus
-}
-#endif // __cplusplus
-
 // #################################################################################################
 
 // use this instead of Lua's lua_error
diff --git a/src/macros_and_utils.h b/src/macros_and_utils.h
index 3e0b425..1c4457a 100644
--- a/src/macros_and_utils.h
+++ b/src/macros_and_utils.h
@@ -1,16 +1,5 @@
 #pragma once
 
-#ifdef __cplusplus
-extern "C"
-{
-#endif // __cplusplus
-#include "lua.h"
-#include "lualib.h"
-#include "lauxlib.h"
-#ifdef __cplusplus
-}
-#endif // __cplusplus
-
 #include "debug.h"
 #include "luaerrors.h"
 
diff --git a/src/universe.h b/src/universe.h
index f0975d8..47b86af 100644
--- a/src/universe.h
+++ b/src/universe.h
@@ -1,14 +1,5 @@
 #pragma once
 
-#ifdef __cplusplus
-extern "C"
-{
-#endif // __cplusplus
-#include "lua.h"
-#ifdef __cplusplus
-}
-#endif // __cplusplus
-
 #include "keeper.h"
 #include "lanesconf.h"
 #include "tracker.h"
-- 
cgit v1.2.3-55-g6feb