summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2004-08-06 17:52:06 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2004-08-06 17:52:06 (GMT)
commite599638365d660d4e86917b2fddf05e2ef1be433 (patch)
treefdc12df6cdf05de3f2b5504450d8463adbd83954
parented4db7ec9da6f2792228c322cf0b53a8e52380f5 (diff)
downloadhdf5-e599638365d660d4e86917b2fddf05e2ef1be433.zip
hdf5-e599638365d660d4e86917b2fddf05e2ef1be433.tar.gz
hdf5-e599638365d660d4e86917b2fddf05e2ef1be433.tar.bz2
[svn-r9036] Purpose:
Bug fix Description: Correct compilation errors w/--enable-hdf5_v1_6 and using the C++ compiler as a C compiler Platforms tested: FreeBSD 4.10 (sleipnir) w/above flags Not tested with h5committest
-rw-r--r--tools/h5jam/h5jam.c7
-rw-r--r--tools/h5jam/h5unjam.c7
-rw-r--r--tools/h5jam/tellub.c7
3 files changed, 18 insertions, 3 deletions
diff --git a/tools/h5jam/h5jam.c b/tools/h5jam/h5jam.c
index 9528b0a..07194cb 100644
--- a/tools/h5jam/h5jam.c
+++ b/tools/h5jam/h5jam.c
@@ -156,7 +156,7 @@ main (int argc, const char *argv[])
int h5fid;
int ofid;
void *edata;
- hid_t (*func) (void *);
+ H5E_auto_t func;
hid_t ifile;
hid_t plist;
herr_t status;
@@ -172,8 +172,13 @@ main (int argc, const char *argv[])
int res;
/* Disable error reporting */
+#ifdef H5_WANT_H5_V1_6_COMPAT
+ H5Eget_auto(&func, &edata);
+ H5Eset_auto(NULL, NULL);
+#else /* H5_WANT_H5_V1_6_COMPAT */
H5Eget_auto (H5E_DEFAULT, &func, &edata);
H5Eset_auto (H5E_DEFAULT, NULL, NULL);
+#endif /* H5_WANT_H5_V1_6_COMPAT */
parse_command_line (argc, argv);
diff --git a/tools/h5jam/h5unjam.c b/tools/h5jam/h5unjam.c
index 22c190a..daa7c05 100644
--- a/tools/h5jam/h5unjam.c
+++ b/tools/h5jam/h5unjam.c
@@ -158,7 +158,7 @@ main(int argc, const char *argv[])
int ufid;
int h5fid;
void *edata;
- hid_t (*func)(void*);
+ H5E_auto_t func;
hid_t ifile;
off_t fsize;
hsize_t usize;
@@ -169,8 +169,13 @@ main(int argc, const char *argv[])
struct stat sbuf;
/* Disable error reporting */
+#ifdef H5_WANT_H5_V1_6_COMPAT
+ H5Eget_auto(&func, &edata);
+ H5Eset_auto(NULL, NULL);
+#else /* H5_WANT_H5_V1_6_COMPAT */
H5Eget_auto(H5E_DEFAULT, &func, &edata);
H5Eset_auto(H5E_DEFAULT, NULL, NULL);
+#endif /* H5_WANT_H5_V1_6_COMPAT */
parse_command_line(argc, argv);
diff --git a/tools/h5jam/tellub.c b/tools/h5jam/tellub.c
index 23d5693..96d332c 100644
--- a/tools/h5jam/tellub.c
+++ b/tools/h5jam/tellub.c
@@ -124,7 +124,7 @@ main (int argc, const char *argv[])
{
char *ifname;
void *edata;
- hid_t (*func) (void *);
+ H5E_auto_t func;
hid_t ifile;
hsize_t usize;
htri_t testval;
@@ -132,8 +132,13 @@ main (int argc, const char *argv[])
hid_t plist;
/* Disable error reporting */
+#ifdef H5_WANT_H5_V1_6_COMPAT
+ H5Eget_auto(&func, &edata);
+ H5Eset_auto(NULL, NULL);
+#else /* H5_WANT_H5_V1_6_COMPAT */
H5Eget_auto (H5E_DEFAULT, &func, &edata);
H5Eset_auto (H5E_DEFAULT, NULL, NULL);
+#endif /* H5_WANT_H5_V1_6_COMPAT */
parse_command_line (argc, argv);