Merge pull request #2090 from albinahlback/cpp_include_fix

Only include headers before `extern "C"`
flintlib · Oct 11, 2024 · 4352a58 · 4352a58
2 parents 0f1659a + 310460c
commit 4352a58
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/src/fexpr.h b/src/fexpr.h
@@ -18,14 +18,14 @@
 #define FEXPR_INLINE static inline
 #endif
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include "mpoly_types.h"
 #include "arf_types.h"
 #include "gr_types.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* FIXME: We need calcium_stream in ca_types.h, but this header includes qqbar.h
    which conditionally defines functions using fexpr_t if and only if FEXPR_H is
    defined. And at this point FEXPR_H is defined, but not fexpr_t... */

diff --git a/src/fexpr_builtin.h b/src/fexpr_builtin.h
@@ -18,12 +18,12 @@
 #define FEXPR_BUILTIN_INLINE static inline
 #endif
 
+#include "fexpr.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "fexpr.h"
-
 /* Builtin symbols */
 
 /* Must be listed in alphabetical order with corresponding entry

diff --git a/src/fmpz_mpoly_q.h b/src/fmpz_mpoly_q.h
@@ -18,15 +18,15 @@
 #define FMPZ_MPOLY_Q_INLINE static inline
 #endif
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include "fmpz.h"
 #include "fmpz_vec.h"
 #include "fmpz_mpoly.h"
 #include "acb_types.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define fmpz_mpoly_q_numref(x) (&((x)->num))
 #define fmpz_mpoly_q_denref(x) (&((x)->den))
 

diff --git a/src/qqbar.h b/src/qqbar.h
@@ -18,15 +18,15 @@
 #define QQBAR_INLINE static inline
 #endif
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include "fmpz_types.h"
 #include "fmpq_types.h"
 #include "mpoly_types.h"
 #include "acb.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef struct
 {
     fmpz_poly_struct poly;