mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-03-31 17:10:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r9036] Purpose:

Browse Source 
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
This commit is contained in:
Quincey Koziol 2004-08-06 12:52:06 -05:00
parent ed4db7ec9d
commit e599638365
3 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/h5jam/h5jam.c
View File

@ -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);

7
tools/h5jam/h5unjam.c
View File

@ -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);

7
tools/h5jam/tellub.c
View File

@ -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);