summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBinh-Minh Ribler <bmribler@hdfgroup.org>2002-12-22 03:30:19 (GMT)
committerBinh-Minh Ribler <bmribler@hdfgroup.org>2002-12-22 03:30:19 (GMT)
commitca003aafc426db7b57f9c83b34f0ca3eec943816 (patch)
treee7df4b45e465ff6f1ba1a0f2090a8632b2b2533c
parent221db7cc32305ede094512fef6b3653713caede4 (diff)
downloadhdf5-ca003aafc426db7b57f9c83b34f0ca3eec943816.zip
hdf5-ca003aafc426db7b57f9c83b34f0ca3eec943816.tar.gz
hdf5-ca003aafc426db7b57f9c83b34f0ca3eec943816.tar.bz2
[svn-r6223] Purpose:
Bug fix - informed by Kent Description: Some identifiers were flagged as unresolved symbols when building with c++ on Windows. The reason is the name of these identifiers were changed by the c++ compiler, also called name mangling. Solution: Moved #ifdef __cplusplus extern "C" { #endif to include the offending identifiers so the c++ compiler will take them as is. Platforms: SunOS 5.7 (arabica) Linux 6.2 (eirene) Windows 2000
-rw-r--r--src/H5Ppublic.h8
-rw-r--r--src/H5public.h8
2 files changed, 8 insertions, 8 deletions
diff --git a/src/H5Ppublic.h b/src/H5Ppublic.h
index e1a6cf1..615967c 100644
--- a/src/H5Ppublic.h
+++ b/src/H5Ppublic.h
@@ -67,6 +67,10 @@ typedef herr_t (*H5P_prp_close_func_t)(const char *name, size_t size, void *valu
/* Define property list iteration function type */
typedef herr_t (*H5P_iterate_t)(hid_t id, const char *name, void *iter_data);
+#ifdef __cplusplus
+extern "C" {
+#endif
+
/*
* The library created property list classes
*/
@@ -108,10 +112,6 @@ H5_DLLVAR hid_t H5P_LST_MOUNT_g;
/* Default hash table size */
#define H5P_DEFAULT_HASH_SIZE 17
-#ifdef __cplusplus
-extern "C" {
-#endif
-
/* Public functions */
H5_DLL hid_t H5Pcreate_class(hid_t parent, const char *name, unsigned hashsize,
H5P_cls_create_func_t cls_create, void *create_data,
diff --git a/src/H5public.h b/src/H5public.h
index 1de03ba..a7b3286 100644
--- a/src/H5public.h
+++ b/src/H5public.h
@@ -66,6 +66,10 @@
#include "H5api_adpt.h"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
/* Version numbers */
#define H5_VERS_MAJOR 1 /* For major interface/format changes */
#define H5_VERS_MINOR 5 /* For minor interface/format changes */
@@ -174,10 +178,6 @@ typedef ssize_t hssize_t;
#endif
#define HADDR_MAX (HADDR_UNDEF-1)
-#ifdef __cplusplus
-extern "C" {
-#endif
-
/* Functions in H5.c */
H5_DLL herr_t H5open(void);
H5_DLL herr_t H5close(void);