From ce28d2097679bd37bec62ef59538692f6ef95be4 Mon Sep 17 00:00:00 2001 From: Quincey Koziol Date: Tue, 31 Jul 2001 12:24:56 -0500 Subject: [svn-r4285] Purpose: Bug Fix Description: Header file is using incorrect macro for detecting parallel I/O when backward compability is turned on. Solution: Fix header files to define prototypes for parallel I/O property list functions when compiled with v1.2 backward compatibility turned on. Platforms tested: Eyeballed... (Elena will be testing shortly) --- src/H5P.c | 2 +- src/H5Ppublic.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/H5P.c b/src/H5P.c index 45aaa8b..5e482e3 100644 --- a/src/H5P.c +++ b/src/H5P.c @@ -2660,7 +2660,7 @@ H5Pget_xfer(hid_t plist_id, H5D_transfer_t *data_xfer_mode) FUNC_LEAVE (SUCCEED); } -#endif /*HAVE_PARALLEL*/ +#endif /* HAVE_PARALLEL */ #endif /* WANT_H5_V1_2_COMPAT */ diff --git a/src/H5Ppublic.h b/src/H5Ppublic.h index 144e68d..7af289c 100644 --- a/src/H5Ppublic.h +++ b/src/H5Ppublic.h @@ -171,12 +171,12 @@ __DLL__ herr_t H5Pget_split(hid_t plist_id, size_t meta_ext_size, char *meta_ext __DLL__ herr_t H5Pset_family(hid_t plist_id, hsize_t memb_size, hid_t memb_plist_id); __DLL__ herr_t H5Pget_family(hid_t plist_id, hsize_t *memb_size/*out*/, hid_t *memb_plist_id/*out*/); -#ifdef HAVE_PARALLEL +#if defined(HAVE_PARALLEL) || defined(H5_HAVE_PARALLEL) __DLL__ herr_t H5Pset_mpi(hid_t plist_id, MPI_Comm comm, MPI_Info info); __DLL__ herr_t H5Pget_mpi(hid_t plist_id, MPI_Comm *comm, MPI_Info *info); __DLL__ herr_t H5Pset_xfer(hid_t plist_id, H5D_transfer_t data_xfer_mode); __DLL__ herr_t H5Pget_xfer(hid_t plist_id, H5D_transfer_t *data_xfer_mode); -#endif /*HAVE_PARALLEL*/ +#endif /*H5_HAVE_PARALLEL*/ #else /* WANT_H5_V1_2_COMPAT */ __DLL__ hid_t H5Pget_driver(hid_t plist_id); #endif /* WANT_H5_V1_2_COMPAT */ -- cgit v0.12