[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

1 files changed, 18 insertions, 0 deletions

diff --git a/src/H5FDprivate.h b/src/H5FDprivate.h
index 7993e91..22d445c 100644
--- a/src/H5FDprivate.h
+++ b/src/H5FDprivate.h
@@ -19,10 +19,28 @@
 #ifndef _H5FDprivate_H
 #define _H5FDprivate_H
 
+/* Include package's public header */
 #include "H5FDpublic.h"
 
+/* Private headers needed by this file */
+
+/*
+ * The MPIO, MPIPOSIX, & FPHDF5 drivers are needed because there are
+ * places where we check for things that aren't handled by these drivers.
+ */
+#include "H5FDfphdf5.h"
+#include "H5FDmpio.h"
+#include "H5FDmpiposix.h"
+
+/* Macros */
+
 #define H5FD_has_cmp(id) (NULL!=H5FD_get_class(id)->cmp)
 
+/* Single macro to check for all file drivers that use MPI */
+#define IS_H5FD_MPI(file)  \
+        (IS_H5FD_MPIO(file) || IS_H5FD_MPIPOSIX(file) || IS_H5FD_FPHDF5(file))
+
+/* Prototypes */
 H5_DLL int H5FD_term_interface(void);
 H5_DLL H5FD_class_t *H5FD_get_class(hid_t id);
 H5_DLL hsize_t H5FD_sb_size(H5FD_t *file);