Merge pull request #6469 from bertwesarg/v4.0.x-allow-user-to-overwri…

…te-OMPI_ENABLE_MPI1_COMPAT v4.0.x: Allow user to overwrite `OMPI_ENABLE_MPI1_COMPAT`
open-mpi · Mar 7, 2019 · 6cbe383 · 6cbe383
2 parents 8b2d804 + 73134ab
commit 6cbe383
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/ompi/include/mpi.h.in b/ompi/include/mpi.h.in
@@ -306,7 +306,9 @@
           * Don't do MACRO magic for building Profiling library as it
           * interferes with the above.
           */
-#        if (OMPI_ENABLE_MPI1_COMPAT || OMPI_BUILDING)
+#        if defined(OMPI_OMIT_MPI1_COMPAT_DECLS)
+             /* The user set OMPI_OMIT_MPI1_COMPAT_DECLS, do what he commands */
+#        elif (OMPI_ENABLE_MPI1_COMPAT || OMPI_BUILDING)
 #            define OMPI_OMIT_MPI1_COMPAT_DECLS 0
 #            define OMPI_REMOVED_USE_STATIC_ASSERT 0
 #            define __mpi_interface_removed__(func, newfunc) __mpi_interface_deprecated__(#func " was removed in MPI-3.0.  Use " #newfunc " instead.  continuing...")