From 38c5d30a992378ae4047338a16e7d5426803ad6f Mon Sep 17 00:00:00 2001
From: Max Horn <max@quendi.de>
Date: Thu, 6 Oct 2022 23:03:31 +0200
Subject: [PATCH] Use gap_all.h instead of src/compiled.h

---
 src/debugger.cc                             | 5 +----
 src/gap_cpp_headers/gap_cpp_mapping.hpp     | 5 ++---
 src/gap_cpp_headers/gap_prototypes.hpp      | 2 +-
 src/gap_cpp_headers/gap_wrapping.hpp        | 3 ++-
 src/gap_cpp_headers/include_gap_headers.hpp | 6 ------
 5 files changed, 6 insertions(+), 15 deletions(-)
 delete mode 100644 src/gap_cpp_headers/include_gap_headers.hpp

diff --git a/src/debugger.cc b/src/debugger.cc
index 8d4c97b..90d4a5c 100644
--- a/src/debugger.cc
+++ b/src/debugger.cc
@@ -2,10 +2,7 @@
  * debugger: Debugging support for GAP
  */
 
-extern "C" {
-#include "src/compiled.h"          /* GAP headers                */
-#include "src/hookintrprtr.h"
-}
+#include "gap_all.h"   // GAP headers
 
 #include "gap_cpp_headers/gap_cpp_mapping.hpp"
 
diff --git a/src/gap_cpp_headers/gap_cpp_mapping.hpp b/src/gap_cpp_headers/gap_cpp_mapping.hpp
index cdac92f..eb394ce 100644
--- a/src/gap_cpp_headers/gap_cpp_mapping.hpp
+++ b/src/gap_cpp_headers/gap_cpp_mapping.hpp
@@ -10,9 +10,8 @@
 #include <utility>
 #include <stdlib.h>
 
-// We have to include this to get around problems with the 'extern C' wrapping of src/compiled.h,
-// which includes gmp, which in C++ mode has some C++ templates.
-#include "include_gap_headers.hpp"
+#include "gap_all.h"   // GAP headers
+
 #include "gap_prototypes.hpp"
 #include "gap_exception.hpp"
 #include "gap_function.hpp"
diff --git a/src/gap_cpp_headers/gap_prototypes.hpp b/src/gap_cpp_headers/gap_prototypes.hpp
index 43ad667..fe5eb3c 100644
--- a/src/gap_cpp_headers/gap_prototypes.hpp
+++ b/src/gap_cpp_headers/gap_prototypes.hpp
@@ -1,7 +1,7 @@
 #ifndef PROTOTYPES_HPP_ZLALA
 #define PROTOTYPES_HPP_ZLALA
 
-#include "include_gap_headers.hpp"
+#include "gap_all.h"   // GAP headers
 
 namespace GAPdetail
 {
diff --git a/src/gap_cpp_headers/gap_wrapping.hpp b/src/gap_cpp_headers/gap_wrapping.hpp
index 008fe4c..0caa0f8 100644
--- a/src/gap_cpp_headers/gap_wrapping.hpp
+++ b/src/gap_cpp_headers/gap_wrapping.hpp
@@ -1,7 +1,8 @@
 #ifndef _GAP_WRAP_HPP_AQD
 #define _GAP_WRAP_HPP_AQD
 
-#include "include_gap_headers.hpp"
+#include "gap_all.h"   // GAP headers
+
 #include "gap_prototypes.hpp"
 #include "gap_exception.hpp"
 
diff --git a/src/gap_cpp_headers/include_gap_headers.hpp b/src/gap_cpp_headers/include_gap_headers.hpp
deleted file mode 100644
index 758b869..0000000
--- a/src/gap_cpp_headers/include_gap_headers.hpp
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _GAP_HEADERS_H_QEHJ
-#define _GAP_HEADERS_H_QEHJ
-
-#include "src/compiled.h"
-
-#endif