moved include outside of 'extern C'

mochi-hpc · Sep 3, 2024 · e973cd6 · e973cd6
1 parent 0855b20
commit e973cd6
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 14 deletions.
diff --git a/include/margo-bulk-pool.h b/include/margo-bulk-pool.h
@@ -8,16 +8,16 @@
 #ifndef __MARGO_BULK_POOL
 #define __MARGO_BULK_POOL
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <mercury.h>
 #include <mercury_types.h>
 #include <mercury_bulk.h>
 #include <mercury_macros.h>
 #include <abt.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* A collection of fixed-size, fixed-permission reusable bulk buffers */
 struct margo_bulk_pool;
 /**

diff --git a/include/margo-bulk-util.h b/include/margo-bulk-util.h
@@ -9,12 +9,12 @@
 #ifndef __MARGO_BULK_UTIL
 #define __MARGO_BULK_UTIL
 
+#include <margo.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include <margo.h>
-
 /**
  * Perform a bulk transfer by submitting multiple margo_bulk_transfer
  * in parallel.

diff --git a/include/margo-config.h b/include/margo-config.h
@@ -8,13 +8,13 @@
 #ifndef __MARGO_CONFIG
 #define __MARGO_CONFIG
 
+#include <mercury.h>
+#include <abt.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include <mercury.h>
-#include <abt.h>
-
 #define DEPRECATED(msg) __attribute__((deprecated(msg)))
 
 /**

diff --git a/include/margo.h b/include/margo.h
@@ -8,10 +8,6 @@
 #ifndef __MARGO
 #define __MARGO
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <stdbool.h>
 #include <mercury.h>
 #include <mercury_types.h>
@@ -23,6 +19,10 @@ extern "C" {
 #include <margo-monitoring.h>
 #include <margo-config.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define DEPRECATED(msg) __attribute__((deprecated(msg)))
 
 /* determine how much of the Mercury ID space to use for Margo provider IDs */
@@ -65,7 +65,8 @@ typedef void (*margo_finalize_callback_t)(void*);
 /**
  * @brief Type of margo_request.
  */
-typedef enum {
+typedef enum
+{
     MARGO_RESPONSE_REQUEST = 2,
     MARGO_FORWARD_REQUEST  = 4,
     MARGO_BULK_REQUEST     = 6,