diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2003-07-11 18:01:05 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2003-07-11 18:01:05 (GMT) |
| commit | 2c92c3ca18ca65ee0bf1e02235ba668808d39030 (patch) | |
| tree | f599204e32d78623d7ca8eddb630f7ca8f9c5f45 /src/H5Smpio.c | |
| parent | 9f171c6addb7a28f920760d4e74948fdbc8a0553 (diff) | |
| download | hdf5-2c92c3ca18ca65ee0bf1e02235ba668808d39030.zip hdf5-2c92c3ca18ca65ee0bf1e02235ba668808d39030.tar.gz hdf5-2c92c3ca18ca65ee0bf1e02235ba668808d39030.tar.bz2 | |
[svn-r7210] Purpose:
Refactoring code
Description:
Refactored "IS_H5FD_MPIO || IS_H5FD_MPIPOSIX || IS_H5FD_FPHDF5" combination
of macros in many places into single IS_H5FD_MPI macro, which has the same
definition, but should be easier to maintain.
Platforms tested:
FreeBSD 4.8 (sleipnir)
h5committest
Diffstat (limited to 'src/H5Smpio.c')
| -rw-r--r-- | src/H5Smpio.c | 31 |
1 files changed, 10 insertions, 21 deletions
diff --git a/src/H5Smpio.c b/src/H5Smpio.c index 224f15a..01dba0a 100644 --- a/src/H5Smpio.c +++ b/src/H5Smpio.c @@ -24,27 +24,16 @@ #define H5F_PACKAGE /*suppress error about including H5Fpkg */ #define H5S_PACKAGE /*suppress error about including H5Spkg */ -#include "H5private.h" /* Internal types, etc. */ -#include "H5Eprivate.h" /* Error reporting */ -#include "H5Fpkg.h" /* Ugly, but necessary for the MPIO I/O accesses */ -#include "H5FDmpio.h" /* MPIO file driver */ -#include "H5FDprivate.h" /* Necessary for the H5FD_write & H5FD_read prototypes.. */ -#include "H5Iprivate.h" /* Object IDs */ -#include "H5Pprivate.h" /* Property Lists */ -#include "H5Spkg.h" /* Dataspaces */ - -#ifndef H5_HAVE_PARALLEL -/* - * The H5S_mpio_xxxx functions are for parallel I/O only and are - * valid only when H5_HAVE_PARALLEL is #defined. This empty #ifndef - * body is used to allow this source file be included in the serial - * distribution. - * Some compilers/linkers may complain about "empty" object file. - * If that happens, uncomment the following statement to pacify - * them. - */ -/* const hbool_t H5S_mpio_avail = FALSE; */ -#else /* H5_HAVE_PARALLEL */ +#include "H5private.h" /* Generic Functions */ +#include "H5Eprivate.h" /* Error handling */ +#include "H5Fpkg.h" /* Files */ +#include "H5FDprivate.h" /* File drivers */ +#include "H5Iprivate.h" /* IDs */ +#include "H5Pprivate.h" /* Property lists */ +#include "H5Spkg.h" /* Dataspaces */ + +#ifdef H5_HAVE_PARALLEL + /* Interface initialization */ #define PABLO_MASK H5Sall_mask #define INTERFACE_INIT NULL |