summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDana Robinson <derobins@hdfgroup.org>2019-09-18 21:31:39 (GMT)
committerDana Robinson <derobins@hdfgroup.org>2019-09-18 21:31:39 (GMT)
commitfa71f922472f3fb79fa2242728f8bc200091b4b9 (patch)
tree6bbef9e4ce691ed6df83f40e56a79de9cddc325d /src
parent421a0c350c3e5b2dc5c544d2c83eae4cd44a9848 (diff)
downloadhdf5-fa71f922472f3fb79fa2242728f8bc200091b4b9.zip
hdf5-fa71f922472f3fb79fa2242728f8bc200091b4b9.tar.gz
hdf5-fa71f922472f3fb79fa2242728f8bc200091b4b9.tar.bz2
Merged HDFFV-10893 (inappropriate MPI C++ linkage) to 1.8.
Diffstat (limited to 'src')
-rw-r--r--src/H5public.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/H5public.h b/src/H5public.h
index 20c611a..d9d7449 100644
--- a/src/H5public.h
+++ b/src/H5public.h
@@ -56,6 +56,9 @@
# include <stddef.h>
#endif
#ifdef H5_HAVE_PARALLEL
+/* Don't link against MPI C++ bindings */
+# define MPICH_SKIP_MPICXX 1
+# define OMPI_SKIP_MPICXX 1
# include <mpi.h>
#ifndef MPI_FILE_NULL /*MPIO may be defined in mpi.h already */
# include <mpio.h>