fixes to handle count/offset/aint in abi.h

Signed-off-by: Howard Pritchard <[email protected]>

Author: hppritcha

ompi/mpi/bindings/c_header.py

@@ -220,13 +220,28 @@ def output_constant(const, use_enum: bool, mangle_name: bool):
          output.append(f"{binding[0]} P{' '.join(binding[1:])};\n")
 
 # ================================ Final Output ================================
-output.append("#endif /* _ABI_INTERNAL_ */")
+output.append("#if defined(__cplusplus)\n")
+output.append("}\n")
+output.append("#endif\n")
+output.append("#endif /* MPI_H_ABI */")
 # === some compilers are finicky about not having empy line at end of include file =====
 output.append("\n")
 
+#replacements = {'MPI_COUNT':'MPI_Count_ABI_INTERNAL',
+#                'MPI_AINT':'MPI_Aint_ABI_INTERNAL',
+#                'MPI_OFFSET':'MPI_Offset_ABI_INTERNAL'}
+replacements = {'MPI_COUNT':'MPI_Count',
+                'MPI_AINT':'MPI_Aint',
+                'MPI_OFFSET':'MPI_Offset'}
+
 for i, line in enumerate(output):
     line = line.replace(r"\ldots", "...")
+    for key, value in replacements.items():
+        if MANGLE_NAMES:
+            value = value+'_ABI_INTERNAL'
+        line = line.replace(f'@{key}@', value)
     if MANGLE_NAMES:
+
         # Replace datatypes with their internal ABI counterparts
         for datatype in INTERNAL_DATATYPES:
             # Need to include the extra space here or else we'll edit functions

ompi/mpi/c/abi.h.in

@@ -1,17 +1,12 @@
-/*
- * $COPYRIGHT$
- *
- * Additional copyrights may follow
- *
- * $HEADER$
- */
+#ifndef MPI_H_ABI
+#define MPI_H_ABI
 
-#ifndef _ABI_INTERNAL_
-#define _ABI_INTERNAL_
+#include <stddef.h>
+#include <stdint.h>
 
-/* TODO: figure out which includes we need, change to <> instead of "" */
-#include "stddef.h"
-#include "stdint.h"
+#if defined(__cplusplus)
+extern "C" {
+#endif
 
 #undef MPI_VERSION
 #define MPI_VERSION    5
@@ -39,23 +34,23 @@ typedef struct MPI_ABI_Win * MPI_Win;
 #if !defined(MPI_ABI_Aint)
 #define MPI_ABI_Aint intptr_t
 #endif
-typedef MPI_ABI_Aint MPI_Aint;
+typedef MPI_ABI_Aint @MPI_AINT@;
 #undef  MPI_ABI_Aint
 
 /* MPI_Offset will be 64b on all relevant systems.
  * We allow for MPI implementations supporting for 128b filesystems. */
 #if !defined(MPI_ABI_Offset)
 #define MPI_ABI_Offset int64_t
 #endif
-typedef MPI_ABI_Offset MPI_Offset;
+typedef MPI_ABI_Offset @MPI_OFFSET@;
 #undef  MPI_ABI_Offset
 
 /* MPI_Count must be large enough to hold the larger of MPI_Aint and MPI_Offset.
  * Platforms where MPI_Aint is larger than MPI_Offset are extremely rare. */
 #if !defined(MPI_ABI_Count)
 #define MPI_ABI_Count MPI_Offset
 #endif
-typedef MPI_ABI_Count MPI_Count;
+typedef MPI_ABI_Count @MPI_COUNT@;
 #undef  MPI_ABI_Count
 
 typedef struct {