BTF: Don't include header in extern "C" block

DrTimothyAldenDavis · Oct 31, 2023 · 319e8e7 · 319e8e7
1 parent d5a7b10
commit 319e8e7
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/BTF/Config/btf.h.in b/BTF/Config/btf.h.in
@@ -90,13 +90,13 @@
 #ifndef _BTF_H
 #define _BTF_H
 
+#include "SuiteSparse_config.h"
+
 /* make it easy for C++ programs to include BTF */
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "SuiteSparse_config.h"
-
 int32_t btf_maxtrans    /* returns # of columns matched */
 (
     /* --- input, not modified: --- */
@@ -218,6 +218,10 @@ int32_t btf_order       /* returns number of blocks found */
 int64_t btf_l_order (int64_t, int64_t *, int64_t *, double , double *,
     int64_t *, int64_t *, int64_t *, int64_t *, int64_t *) ;
 
+#ifdef __cplusplus
+}
+#endif
+
 
 /* ========================================================================== */
 /* === BTF marking of singular columns ====================================== */
@@ -262,7 +266,4 @@ int64_t btf_l_order (int64_t, int64_t *, int64_t *, double , double *,
 #define BTF_VERSION_CODE(main,sub) ((main) * 1000 + (sub))
 #define BTF_VERSION BTF_VERSION_CODE(BTF_MAIN_VERSION,BTF_SUB_VERSION)
 
-#ifdef __cplusplus
-}
-#endif
 #endif
diff --git a/BTF/Include/btf.h b/BTF/Include/btf.h
@@ -90,13 +90,13 @@
 #ifndef _BTF_H
 #define _BTF_H
 
+#include "SuiteSparse_config.h"
+
 /* make it easy for C++ programs to include BTF */
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "SuiteSparse_config.h"
-
 int32_t btf_maxtrans    /* returns # of columns matched */
 (
     /* --- input, not modified: --- */
@@ -218,6 +218,10 @@ int32_t btf_order       /* returns number of blocks found */
 int64_t btf_l_order (int64_t, int64_t *, int64_t *, double , double *,
     int64_t *, int64_t *, int64_t *, int64_t *, int64_t *) ;
 
+#ifdef __cplusplus
+}
+#endif
+
 
 /* ========================================================================== */
 /* === BTF marking of singular columns ====================================== */
@@ -262,7 +266,4 @@ int64_t btf_l_order (int64_t, int64_t *, int64_t *, double , double *,
 #define BTF_VERSION_CODE(main,sub) ((main) * 1000 + (sub))
 #define BTF_VERSION BTF_VERSION_CODE(BTF_MAIN_VERSION,BTF_SUB_VERSION)
 
-#ifdef __cplusplus
-}
-#endif
 #endif