Enable mpi-compat.h to always be included

Unidata · Sep 29, 2023 · b0a030f · b0a030f
1 parent f1e697b
commit b0a030f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/include/mpi-compat.h b/include/mpi-compat.h
@@ -4,6 +4,10 @@
 #ifndef MPI_COMPAT_H
 #define MPI_COMPAT_H
 
+#include "netcdf-compat.h"
+
+#if HAS_PARALLEL_SUPPORT
+
 #include <mpi.h>
 
 #if (MPI_VERSION < 3) && !defined(PyMPI_HAVE_MPI_Message)
@@ -16,4 +20,6 @@ typedef void *PyMPI_MPI_Session;
 #define MPI_Session PyMPI_MPI_Session
 #endif
 
+#endif /* HAS_PARALLEL_SUPPORT */
+
 #endif/*MPI_COMPAT_H*/
diff --git a/include/netCDF4.pxi b/include/netCDF4.pxi
@@ -366,8 +366,8 @@ cdef extern from "netcdf.h":
     int nc_inq_enum_ident(int ncid, nc_type xtype, long long value, char *identifier) nogil
 
 
-IF HAS_PARALLEL_SUPPORT:
-    cdef extern from "mpi-compat.h": pass
+cdef extern from "mpi-compat.h":
+    pass
 
 
 # taken from numpy.pxi in numpy 1.0rc2.

diff --git a/include/netcdf-compat.h b/include/netcdf-compat.h
@@ -1,3 +1,6 @@
+#ifndef NETCDF_COMPAT_H
+#define NETCDF_COMPAT_H
+
 #include <netcdf.h>
 #include <netcdf_meta.h>
 
@@ -192,3 +195,5 @@ static inline int nc_inq_var_blosc(int ncid, int varid, int* hasfilterp, unsigne
 # endif
 #define HAS_BLOSC_SUPPORT 0
 #endif
+
+#endif /* NETCDF_COMPAT_H */