diff options
| author | Neil Fortner <nfortne2@hdfgroup.org> | 2013-09-27 14:50:38 (GMT) |
|---|---|---|
| committer | Neil Fortner <nfortne2@hdfgroup.org> | 2013-09-27 14:50:38 (GMT) |
| commit | adb2fd1cc0858602046959689377dbdb60a4c3a6 (patch) | |
| tree | 3d2ea72ca7ba9c2502d9c2230d261acd9fe7c95d /src/H5Fpkg.h | |
| parent | 9f69967286c1014355421b02db986303de1cfcda (diff) | |
| parent | ebc0b44fe18a40b7f31bdde45ec9f16edd4f658a (diff) | |
| download | hdf5-adb2fd1cc0858602046959689377dbdb60a4c3a6.zip hdf5-adb2fd1cc0858602046959689377dbdb60a4c3a6.tar.gz hdf5-adb2fd1cc0858602046959689377dbdb60a4c3a6.tar.bz2 | |
[svn-r24208] Merge revisions through r24202 from trunk to vol branch
Tested: jam, koala, ostrich, platypus (h5committest)
There are failures on platypus (cmake) that were present previously
Diffstat (limited to 'src/H5Fpkg.h')
| -rw-r--r-- | src/H5Fpkg.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/H5Fpkg.h b/src/H5Fpkg.h index e37e1e8..dff9e88 100644 --- a/src/H5Fpkg.h +++ b/src/H5Fpkg.h @@ -297,7 +297,7 @@ H5_DLLVAR const H5AC_class_t H5AC_SUPERBLOCK[1]; /* General routines */ H5_DLL herr_t H5F_init(void); -H5_DLL haddr_t H5F_locate_signature(H5FD_t *file, hid_t dxpl_id); +H5_DLL herr_t H5F_locate_signature(H5FD_t *file, hid_t dxpl_id, haddr_t *sig_addr); H5_DLL herr_t H5F_flush(H5F_t *f, hid_t dxpl_id, hbool_t closing); /* File mount related routines */ |