summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Kim Yates <rkyates@llnl.gov>1998-09-01 22:42:00 (GMT)
committerRobert Kim Yates <rkyates@llnl.gov>1998-09-01 22:42:00 (GMT)
commit0a6f9f16d8497c8b8d41498a9c544a1a7832e75b (patch)
tree6b3f2e900072189be851a1e7752a219c5e56c37e
parent260af101fa765cf059054f02c4be1241e2671d03 (diff)
downloadhdf5-0a6f9f16d8497c8b8d41498a9c544a1a7832e75b.zip
hdf5-0a6f9f16d8497c8b8d41498a9c544a1a7832e75b.tar.gz
hdf5-0a6f9f16d8497c8b8d41498a9c544a1a7832e75b.tar.bz2
[svn-r652] Removed H5Fmpioprivate.h, moved its contents to H5Fprivate.h.
-rw-r--r--src/H5Fmpioprivate.h25
-rw-r--r--src/H5Fprivate.h9
2 files changed, 9 insertions, 25 deletions
diff --git a/src/H5Fmpioprivate.h b/src/H5Fmpioprivate.h
deleted file mode 100644
index a51eb36..0000000
--- a/src/H5Fmpioprivate.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/****************************************************************************
- * NCSA HDF *
- * Software Development Group *
- * National Center for Supercomputing Applications *
- * University of Illinois at Urbana-Champaign *
- * 605 E. Springfield, Champaign IL 61820 *
- * *
- * For conditions of distribution and use, see the accompanying *
- * hdf/COPYING file. *
- * *
- ****************************************************************************/
-
-/*
- * This file contains macros & information for MPI-IO file access
- */
-
-#ifndef _H5Fmpioprivate_H
-#define _H5Fmpioprivate_H
-
-#ifdef HAVE_PARALLEL
-extern hbool_t H5_mpi_1_metawrite_g;
-hbool_t H5F_mpio_tas_allsame(H5F_low_t *lf, hbool_t newval );
-#endif /* HAVE_PARALLEL */
-
-#endif
diff --git a/src/H5Fprivate.h b/src/H5Fprivate.h
index 5e60efe..3951671 100644
--- a/src/H5Fprivate.h
+++ b/src/H5Fprivate.h
@@ -510,6 +510,10 @@ struct H5O_pline_t; /*forward decl for prototype arguments */
extern const H5F_create_t H5F_create_dflt;
extern H5F_access_t H5F_access_dflt;
+#ifdef HAVE_PARALLEL
+extern hbool_t H5_mpi_1_metawrite_g;
+#endif /* HAVE_PARALLEL */
+
/* Private functions, not part of the publicly documented API */
herr_t H5F_init_interface(void);
void H5F_encode_length_unusual(const H5F_t *f, uint8 **p, uint8 *l);
@@ -608,4 +612,9 @@ void H5F_addr_adj(haddr_t *addr/*in,out*/, hssize_t adj);
void H5F_addr_add(haddr_t *, const haddr_t *);
uintn H5F_addr_hash(const haddr_t *, uintn mod);
+/* Functions for MPI-IO */
+#ifdef HAVE_PARALLEL
+hbool_t H5F_mpio_tas_allsame(H5F_low_t *lf, hbool_t newval );
+#endif /* HAVE_PARALLEL */
+
#endif