[svn-r4274]

Purpose:
    Bug Fix
Description:
    When compiling with a C++ compiler, the compiler would balk at
    finding some file drivers.
Solution:
    We need to put this:

        #ifdef __cplusplus
        extern "C" {
        #endif

            /* ... */

        #ifdef __cplusplus
        }
        #endif

    around function declarations.

9 files changed, 60 insertions, 0 deletions

diff --git a/src/H5FDcore.h b/src/H5FDcore.h
index f76021f..171ef8d 100644
--- a/src/H5FDcore.h
+++ b/src/H5FDcore.h
@@ -14,10 +14,18 @@
 
 #define H5FD_CORE	(H5FD_core_init())
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 __DLL__ hid_t H5FD_core_init(void);
 __DLL__ herr_t H5Pset_fapl_core(hid_t fapl_id, size_t increment,
 				hbool_t backing_store);
 __DLL__ herr_t H5Pget_fapl_core(hid_t fapl_id, size_t *increment/*out*/,
 				hbool_t *backing_store/*out*/);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/src/H5FDdpss.h b/src/H5FDdpss.h
index 969ff38..e67df30 100644
--- a/src/H5FDdpss.h
+++ b/src/H5FDdpss.h
@@ -22,10 +22,18 @@
 /* Function prototypes */
 #ifdef H5_HAVE_GRIDSTORAGE
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 hid_t H5FD_dpss_init(void);
 herr_t H5Pset_fapl_dpss (hid_t fapl_id);
 herr_t H5Pget_fapl_dpss (hid_t fapl_id);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
 
 #endif /* H5FDdpss_H */
diff --git a/src/H5FDfamily.h b/src/H5FDfamily.h
index 182ff8a..720e45c 100644
--- a/src/H5FDfamily.h
+++ b/src/H5FDfamily.h
@@ -14,10 +14,18 @@
 
 #define H5FD_FAMILY	(H5FD_family_init())
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 __DLL__ hid_t H5FD_family_init(void);
 __DLL__ herr_t H5Pset_fapl_family(hid_t fapl_id, hsize_t memb_size,
 			  hid_t memb_fapl_id);
 __DLL__ herr_t H5Pget_fapl_family(hid_t fapl_id, hsize_t *memb_size/*out*/,
 			  hid_t *memb_fapl_id/*out*/);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/src/H5FDgass.h b/src/H5FDgass.h
index 5f06e0e..a0f84d7 100644
--- a/src/H5FDgass.h
+++ b/src/H5FDgass.h
@@ -38,10 +38,19 @@ typedef struct GASS_Info {
 
 /* Function prototypes */
 #ifdef H5_HAVE_GASS
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 hid_t H5FD_gass_init(void);
 herr_t H5Pset_fapl_gass(hid_t fapl_id, GASS_Info info);
 herr_t H5Pget_fapl_gass(hid_t fapl_id, GASS_Info *info/*out*/);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
 
 #endif /* H5FDgass_H */
diff --git a/src/H5FDlog.h b/src/H5FDlog.h
index 1221291..f767d4b 100644
--- a/src/H5FDlog.h
+++ b/src/H5FDlog.h
@@ -17,6 +17,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+
 __DLL__ hid_t H5FD_log_init(void);
 __DLL__ herr_t H5Pset_fapl_log(hid_t fapl_id, char *logfile, int verbosity);
 
diff --git a/src/H5FDmpio.h b/src/H5FDmpio.h
index 86ba0f7..7a1c344 100644
--- a/src/H5FDmpio.h
+++ b/src/H5FDmpio.h
@@ -50,6 +50,7 @@ typedef struct H5FD_mpio_dxpl_t {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
 __DLL__ hid_t H5FD_mpio_init(void);
 __DLL__ herr_t H5Pset_fapl_mpio(hid_t fapl_id, MPI_Comm comm, MPI_Info info);
 __DLL__ herr_t H5Pget_fapl_mpio(hid_t fapl_id, MPI_Comm *comm/*out*/,
@@ -62,6 +63,7 @@ __DLL__ herr_t H5FD_mpio_setup(H5FD_t *_file, MPI_Datatype btype, MPI_Datatype f
 		       haddr_t disp, hbool_t use_types);
 __DLL__ herr_t H5FD_mpio_wait_for_left_neighbor(H5FD_t *file);
 __DLL__ herr_t H5FD_mpio_signal_right_neighbor(H5FD_t *file);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/H5FDmulti.h b/src/H5FDmulti.h
index c1c44f3..12d91fc 100644
--- a/src/H5FDmulti.h
+++ b/src/H5FDmulti.h
@@ -14,6 +14,10 @@
 
 #define H5FD_MULTI	(H5FD_multi_init())
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 __DLL__ hid_t H5FD_multi_init(void);
 __DLL__ herr_t H5Pset_fapl_multi(hid_t fapl_id, const H5FD_mem_t *memb_map,
 			 const hid_t *memb_fapl, const char **memb_name,
@@ -28,4 +32,8 @@ __DLL__ herr_t H5Pset_fapl_split(hid_t fapl, const char *meta_ext,
 			 hid_t meta_plist_id, const char *raw_ext,
 			 hid_t raw_plist_id);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/src/H5FDsrb.h b/src/H5FDsrb.h
index 306be7c..3ed0646 100644
--- a/src/H5FDsrb.h
+++ b/src/H5FDsrb.h
@@ -26,10 +26,18 @@ typedef struct SRB_Info {    /* Define the SRB info object.                  */
     int  size;               /* File Size-Only valid for HPSS, -1 is default */
 } SRB_Info;
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 __DLL__ hid_t  H5FD_srb_init(void);
 __DLL__ herr_t H5Pset_fapl_srb(hid_t fapl_id, SRB_Info info);
 __DLL__ herr_t H5Pget_fapl_srb(hid_t fapl_id, SRB_Info *info);
 
+#ifdef __cplusplus
+}
+#endif
+
 #else
 #define H5FD_SRB   (-1)
 #endif /* H5_HAVE_SRB */
diff --git a/src/H5FDstdio.h b/src/H5FDstdio.h
index 65234cc..df71231 100644
--- a/src/H5FDstdio.h
+++ b/src/H5FDstdio.h
@@ -14,7 +14,15 @@
 
 #define H5FD_STDIO	(H5FD_stdio_init())
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 __DLL__ hid_t H5FD_stdio_init(void);
 __DLL__ herr_t H5Pset_fapl_stdio(hid_t fapl_id);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif