From 319e8e76a220e97d4642c8e186c4760cee7fc9e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=BCtzel?= Date: Tue, 31 Oct 2023 19:15:33 +0100 Subject: [PATCH] BTF: Don't include header in `extern "C"` block --- BTF/Config/btf.h.in | 11 ++++++----- BTF/Include/btf.h | 11 ++++++----- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/BTF/Config/btf.h.in b/BTF/Config/btf.h.in index 01fda8fd8..ff88a78b7 100644 --- 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 index 1675fabd0..c9d56b6df 100644 --- 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