diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2008-06-16 22:17:29 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2008-06-16 22:17:29 (GMT) |
| commit | db2c4c497abab139485dbf6797e56b1340e4577d (patch) | |
| tree | f7dfb321a3643658ed24aaf776ec4c1e48bc76a3 /src/H5MFprivate.h | |
| parent | 55af47c47c3c0c7bc17266968f5e0e782189e819 (diff) | |
| download | hdf5-db2c4c497abab139485dbf6797e56b1340e4577d.zip hdf5-db2c4c497abab139485dbf6797e56b1340e4577d.tar.gz hdf5-db2c4c497abab139485dbf6797e56b1340e4577d.tar.bz2 | |
[svn-r15221] Description:
Bring changes from trunk from the time the branch was created (r14280)
up to the 1.8.0 release (r14525) back into the metadata journaling branch.
Tested on:
FreeBSD/32 6.2 (duty) in debug mode
FreeBSD/64 6.2 (liberty) w/C++ & FORTRAN, in debug mode
Linux/32 2.6 (kagiso) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe,
in debug mode
Linux/64-amd64 2.6 (smirom) w/default API=1.6.x, w/C++ & FORTRAN,
in production mode
Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
in production mode
Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
w/szip filter, in production mode
Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in production mode
Diffstat (limited to 'src/H5MFprivate.h')
| -rw-r--r-- | src/H5MFprivate.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/H5MFprivate.h b/src/H5MFprivate.h index b3f0d17..e01a9f6 100644 --- a/src/H5MFprivate.h +++ b/src/H5MFprivate.h @@ -29,9 +29,8 @@ #define _H5MFprivate_H /* Private headers needed by this file */ -#include "H5private.h" -#include "H5Fprivate.h" -#include "H5FDprivate.h" /*file driver */ +#include "H5Fprivate.h" /* File access */ +#include "H5FDprivate.h" /* File Drivers */ /* * Feature: Define H5MF_DEBUG on the compiler command line if you want to @@ -49,10 +48,10 @@ H5_DLL herr_t H5MF_xfree(const H5F_t *f, H5FD_mem_t type, hid_t dxpl_id, haddr_t hsize_t size); H5_DLL haddr_t H5MF_realloc(H5F_t *f, H5FD_mem_t type, hid_t dxpl_id, haddr_t old_addr, hsize_t old_size, hsize_t new_size); -H5_DLL hbool_t H5MF_alloc_overflow(const H5F_t *f, hsize_t size); H5_DLL htri_t H5MF_can_extend(H5F_t *f, H5FD_mem_t type, haddr_t addr, hsize_t size, hsize_t extra_requested); H5_DLL herr_t H5MF_extend(H5F_t *f, H5FD_mem_t type, haddr_t addr, hsize_t size, hsize_t extra_requested); -#endif +#endif /* end _H5MFprivate_H */ + |