summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBill Wendling <wendling@ncsa.uiuc.edu>2001-07-30 17:03:57 (GMT)
committerBill Wendling <wendling@ncsa.uiuc.edu>2001-07-30 17:03:57 (GMT)
commit06791fbe958506f1c80888bb8f80c73e1528be44 (patch)
tree6adf4fd3caf546742653058e7c182339c357d3cf /src
parent273602af14c83cf86a33d12768fba7f3a87e277f (diff)
downloadhdf5-06791fbe958506f1c80888bb8f80c73e1528be44.zip
hdf5-06791fbe958506f1c80888bb8f80c73e1528be44.tar.gz
hdf5-06791fbe958506f1c80888bb8f80c73e1528be44.tar.bz2
[svn-r4275]
Purpose: Bug Fix Description: Forward port of the bug fix to the 1.4 branch reguarding the C++ compile error. Solution: Need to put #ifdef __cplusplus extern "C" { #endif /* ... */ #ifdef __cplusplus } #endif around function declarations.
Diffstat (limited to 'src')
-rw-r--r--src/H5FDcore.h6
-rw-r--r--src/H5FDdpss.h9
-rw-r--r--src/H5FDfamily.h8
-rw-r--r--src/H5FDgass.h9
-rw-r--r--src/H5FDlog.h1
-rw-r--r--src/H5FDmulti.h6
-rw-r--r--src/H5FDsrb.h8
-rw-r--r--src/H5FDstdio.h8
8 files changed, 53 insertions, 2 deletions
diff --git a/src/H5FDcore.h b/src/H5FDcore.h
index 7f002f7..b37a883 100644
--- a/src/H5FDcore.h
+++ b/src/H5FDcore.h
@@ -14,10 +14,16 @@
#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 851956d..fd9e2b8 100644
--- a/src/H5FDdpss.h
+++ b/src/H5FDdpss.h
@@ -22,11 +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 c8f8481..c1b6e13 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 88a4e69..f9ba502 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 6703cf7..65d1222 100644
--- a/src/H5FDlog.h
+++ b/src/H5FDlog.h
@@ -26,4 +26,3 @@ __DLL__ herr_t H5Pset_fapl_log(hid_t fapl_id, char *logfile, int verbosity);
#endif
#endif
-
diff --git a/src/H5FDmulti.h b/src/H5FDmulti.h
index 8bd81d5..9e908ba 100644
--- a/src/H5FDmulti.h
+++ b/src/H5FDmulti.h
@@ -14,6 +14,9 @@
#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,
@@ -27,5 +30,8 @@ __DLL__ herr_t H5Pget_dxpl_multi(hid_t dxpl_id, hid_t *memb_dxpl/*out*/);
__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 a7e1953..162b030 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 3d7281f..ffeef16 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