diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2008-06-18 16:58:08 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2008-06-18 16:58:08 (GMT) |
| commit | 3c3a1388df917a17e863a59675e2d4ba4606af15 (patch) | |
| tree | 3ac9c3260c89124d1fc907cc89191c2b96937f1b /tools/h5repack/h5repack.h | |
| parent | 5f840fac789821f1b6acf951725b148971b8ae18 (diff) | |
| download | hdf5-3c3a1388df917a17e863a59675e2d4ba4606af15.zip hdf5-3c3a1388df917a17e863a59675e2d4ba4606af15.tar.gz hdf5-3c3a1388df917a17e863a59675e2d4ba4606af15.tar.bz2 | |
[svn-r15231] Description:
Merge revisions 14525:14700 from trunk into 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
Mac OS X/32 10.5.2 (amazon) in debug mode
Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in production mode
Diffstat (limited to 'tools/h5repack/h5repack.h')
| -rw-r--r-- | tools/h5repack/h5repack.h | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/tools/h5repack/h5repack.h b/tools/h5repack/h5repack.h index baa888e..80fb1b0 100644 --- a/tools/h5repack/h5repack.h +++ b/tools/h5repack/h5repack.h @@ -19,17 +19,12 @@ #include "hdf5.h" #include "h5trav.h" -#include "H5Zprivate.h" /* H5Z_COMMON_CD_VALUES */ - - #define H5FOPENERROR "unable to open file" - -#define PFORMAT "%-7s %-7s %-7s\n" /*chunk info, compression info, name*/ -#define PFORMAT1 "%-7s %-7s %-7s" /*chunk info, compression info, name*/ - -#define MAX_NC_NAME 256 /* max length of a name */ -#define MAX_VAR_DIMS 32 /* max per variable dimensions */ +#define PFORMAT "%-7s %-7s %-7s\n" /* chunk info, compression info, name*/ +#define PFORMAT1 "%-7s %-7s %-7s" /* chunk info, compression info, name*/ +#define MAX_NC_NAME 256 /* max length of a name */ +#define MAX_VAR_DIMS 32 /* max per variable dimensions */ /*------------------------------------------------------------------------- * data structures for command line options @@ -53,7 +48,6 @@ typedef struct { H5Z_FILTER_SCALEOFFSET 6 , scaleoffset compression */ -/* #define CD_VALUES H5Z_COMMON_CD_VALUES */ #define CD_VALUES 20 typedef struct { |