diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2011-04-26 21:48:43 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2011-04-26 21:48:43 (GMT) |
| commit | 78dccd425965e35ead292a02578f71d1ffda4f24 (patch) | |
| tree | 7c140f0d92d34ac185a9085b861df986eee545e9 /src/H5FDlog.c | |
| parent | 814c2225da42a7fa3b071fbec74536c1b5ea2db4 (diff) | |
| download | hdf5-78dccd425965e35ead292a02578f71d1ffda4f24.zip hdf5-78dccd425965e35ead292a02578f71d1ffda4f24.tar.gz hdf5-78dccd425965e35ead292a02578f71d1ffda4f24.tar.bz2 | |
[svn-r20653] Description:
Bring r20651 & r20652 from trunk to 1.8 branch:
Switch from using 'pthread_create' to 'pthread_self' when trying to
detect the pthread library, so that the Intel C compiler is happier with the
prototype.
Teach the tracing script & routines about the 'unsigned long' and
'unsigned long long' types, so that the H5Pset_fapl_log() API routine gets
tracing information correct.
Tested on:
FreeBSD/32 6.3 (duty)
(h5committested on trunk)
Diffstat (limited to 'src/H5FDlog.c')
| -rw-r--r-- | src/H5FDlog.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/H5FDlog.c b/src/H5FDlog.c index 96df596..76053ec 100644 --- a/src/H5FDlog.c +++ b/src/H5FDlog.c @@ -318,7 +318,7 @@ H5Pset_fapl_log(hid_t fapl_id, const char *logfile, unsigned long long flags, si herr_t ret_value; FUNC_ENTER_API(H5Pset_fapl_log, FAIL) - H5TRACE4("e", "i*sIuz", fapl_id, logfile, flags, buf_size); + H5TRACE4("e", "i*sULz", fapl_id, logfile, flags, buf_size); if(NULL == (plist = H5P_object_verify(fapl_id, H5P_FILE_ACCESS))) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file access property list") |