Don't double-define preprocessor macros

If MPI-related macros are already defined, don't set them again as this will result in a lot of compiler warnings.
salilab · May 11, 2024 · f5c9553 · f5c9553
1 parent 0fbac99
commit f5c9553
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 0 deletions.
diff --git a/modules/mpi/include/ReplicaExchange.h b/modules/mpi/include/ReplicaExchange.h
@@ -14,9 +14,15 @@
 #include <string>
 
 // We only want the C API, so try to suppress the C++ API
+#ifndef MPICH_SKIP_MPICXX
 #define MPICH_SKIP_MPICXX
+#endif
+#ifndef OMPI_SKIP_MPICXX
 #define OMPI_SKIP_MPICXX
+#endif
+#ifndef _MPICC_H
 #define _MPICC_H
+#endif
 #include <mpi.h>
 
 IMPMPI_BEGIN_NAMESPACE

diff --git a/modules/mpi/src/ReplicaExchange.cpp b/modules/mpi/src/ReplicaExchange.cpp
@@ -9,9 +9,15 @@
 #include <IMP/mpi/internal/mpi_helpers.h>
 
 // We only want the C API, so try to suppress the C++ API
+#ifndef MPICH_SKIP_MPICXX
 #define MPICH_SKIP_MPICXX
+#endif
+#ifndef OMPI_SKIP_MPICXX
 #define OMPI_SKIP_MPICXX
+#endif
+#ifndef _MPICC_H
 #define _MPICC_H
+#endif
 #include "mpi.h"
 
 #include <IMP/random.h>

diff --git a/modules/mpi/src/internal/mpi_helpers.cpp b/modules/mpi/src/internal/mpi_helpers.cpp
@@ -8,9 +8,15 @@
 #include <IMP/mpi/internal/mpi_helpers.h>
 
 // We only want the C API, so try to suppress the C++ API
+#ifndef MPICH_SKIP_MPICXX
 #define MPICH_SKIP_MPICXX
+#endif
+#ifndef OMPI_SKIP_MPICXX
 #define OMPI_SKIP_MPICXX
+#endif
+#ifndef _MPICC_H
 #define _MPICC_H
+#endif
 #include "mpi.h"
 
 #if defined(OMPI_MAJOR_VERSION) && !defined(_MSC_VER)

diff --git a/modules/mpi/utility/hello_world.cpp b/modules/mpi/utility/hello_world.cpp
@@ -5,9 +5,15 @@
 #include <iostream>
 
 // We only want the C API, so try to suppress the C++ API
+#ifndef MPICH_SKIP_MPICXX
 #define MPICH_SKIP_MPICXX
+#endif
+#ifndef OMPI_SKIP_MPICXX
 #define OMPI_SKIP_MPICXX
+#endif
+#ifndef _MPICC_H
 #define _MPICC_H
+#endif
 #include <mpi.h>
 
 static int numprocs;

diff --git a/modules/spb/bin/spb.cpp b/modules/spb/bin/spb.cpp
@@ -20,9 +20,15 @@
 #include <string>
 
 // We only want the C API, so try to suppress the C++ API
+#ifndef MPICH_SKIP_MPICXX
 #define MPICH_SKIP_MPICXX
+#endif
+#ifndef OMPI_SKIP_MPICXX
 #define OMPI_SKIP_MPICXX
+#endif
+#ifndef _MPICC_H
 #define _MPICC_H
+#endif
 #include "mpi.h"
 
 using namespace IMP;

diff --git a/modules/spb/bin/spb_density_perbead.cpp b/modules/spb/bin/spb_density_perbead.cpp
@@ -18,9 +18,15 @@
 #include <string>
 
 // We only want the C API, so try to suppress the C++ API
+#ifndef MPICH_SKIP_MPICXX
 #define MPICH_SKIP_MPICXX
+#endif
+#ifndef OMPI_SKIP_MPICXX
 #define OMPI_SKIP_MPICXX
+#endif
+#ifndef _MPICC_H
 #define _MPICC_H
+#endif
 #include "mpi.h"
 
 using namespace IMP;