[svn-r20658] Description:

	Bring code contribution from John Biddiscombe into trunk, according to
IP assignment #002 (on file).  Checkin message from John is:

	This patch includes the changes necessary to compile a Virtual File
	Driver outside of the main hdf5 build and still have it link against
	the hdf5 core and work correctly at run-time.

	Certain MPI-IO related VFD checks were hard-coded in the hdf5 source
	and so it was not possible to extend the functionality to new drivers.
 
	Removed IS_H5FD_MPI macros and replaced with H5F_HAS_FEATURE calls with
	new keys, H5FD_FEAT_HAS_MPI and H5FD_FEAT_ALLOCATE_EARLY.
 
	Change H5FD cleanup (term_interface) so that file drivers call
	terminate when their class types are deleted instead of explicitly
	being called from the finalization code. Move the terminate call out
	of H5I and put it into the FD class_free call. Remove the now obsolete
	check of handles after cleaning types at termination time.
 
Tested on:
        FreeBSD/32 6.3 (duty) in debug mode
        FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
        FreeBSD/32 8.2 (loyalty) w/gcc4.6, w/C++ & FORTRAN, in debug mode
        FreeBSD/64 8.2 (freedom) w/gcc4.6, w/C++ & FORTRAN, in debug mode
        Linux/32 2.6 (jam) w/PGI compilers, w/default API=1.8.x,
                w/C++ & FORTRAN, w/threadsafe, in debug mode
        Linux/64-amd64 2.6 (koala) w/Intel compilers, w/default API=1.6.x,
                w/C++ & FORTRAN, in production mode
        Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
                w/szip filter, w/threadsafe, in production mode
        Linux/PPC 2.6 (heiwa) w/C++ & FORTRAN, w/threadsafe, in debug mode
        Linux/64-ia64 2.6 (ember) w/Intel compilers, w/C++ & FORTRAN,
                in production mode
        Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in debug mode

1 files changed, 1 insertions, 5 deletions

diff --git a/src/H5FDmulti.h b/src/H5FDmulti.h
index c7e54ce..da16b0c 100644
--- a/src/H5FDmulti.h
+++ b/src/H5FDmulti.h
@@ -22,17 +22,12 @@
 #ifndef H5FDmulti_H
 #define H5FDmulti_H
 
-#include "H5Ipublic.h"
-#include "H5Ppublic.h"             /* Property lists */
-#include "H5Fpublic.h"
-
 #define H5FD_MULTI	(H5FD_multi_init())
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 H5_DLL hid_t H5FD_multi_init(void);
-H5_DLL void H5FD_multi_term(void);
 H5_DLL herr_t H5Pset_fapl_multi(hid_t fapl_id, const H5FD_mem_t *memb_map,
 			 const hid_t *memb_fapl, const char * const *memb_name,
 			 const haddr_t *memb_addr, hbool_t relax);
@@ -50,3 +45,4 @@ H5_DLL herr_t H5Pset_fapl_split(hid_t fapl, const char *meta_ext,
 #endif
 
 #endif
+