Various fixes for test runs - introducing MEDCOUPLING_RESOURCE_DIR env variable

[tools/medcoupling.git] / src / ParaMEDMEMTest / MPI2Connector.cxx

diff --git a/src/ParaMEDMEMTest/MPI2Connector.cxx b/src/ParaMEDMEMTest/MPI2Connector.cxx
index 87b16bfb24419b64d54e43f132831ec307c57f70..ddcba11c2bfd70d7e826f398720f48db3f60baf2 100644 (file)
--- a/src/ParaMEDMEMTest/MPI2Connector.cxx
+++ b/src/ParaMEDMEMTest/MPI2Connector.cxx
@@ -26,10 +26,15 @@
 #include <unistd.h>
 #endif
 
-#if OMPI_MAJOR_VERSION >= 4
-#define MPI_ERROR_HANDLER(var) MPI_Comm_set_errhandler(MPI_COMM_WORLD, var);
-#else
-#define MPI_ERROR_HANDLER(var) MPI_Errhandler_set(MPI_COMM_WORLD, var);
+
+#ifdef OMPI_MAJOR_VERSION 
+#   if OMPI_MAJOR_VERSION >= 4
+#      define MPI_ERROR_HANDLER(var) MPI_Comm_set_errhandler(MPI_COMM_WORLD, var)
+#   else
+#      define MPI_ERROR_HANDLER(var) MPI_Errhandler_set(MPI_COMM_WORLD, var)
+#   endif
+#else  // MPICH and other versions:
+#   define MPI_ERROR_HANDLER(var) MPI_Errhandler_set(MPI_COMM_WORLD, var)
 #endif
 
 MPI2Connector::MPI2Connector()