diff options
| author | Pedro Vicente Nunes <pvn@hdfgroup.org> | 2007-06-18 20:03:30 (GMT) |
|---|---|---|
| committer | Pedro Vicente Nunes <pvn@hdfgroup.org> | 2007-06-18 20:03:30 (GMT) |
| commit | d9a56fa9ad4a8fc82eaf7ee91863488adb5a3146 (patch) | |
| tree | 27e31ca5c3273683f5d420d394f1753b65182720 /tools/h5dump | |
| parent | 5e7acfed72dab3bb0a653067b99b18368bdba3f3 (diff) | |
| download | hdf5-d9a56fa9ad4a8fc82eaf7ee91863488adb5a3146.zip hdf5-d9a56fa9ad4a8fc82eaf7ee91863488adb5a3146.tar.gz hdf5-d9a56fa9ad4a8fc82eaf7ee91863488adb5a3146.tar.bz2 | |
[svn-r13874]
Changed macro names, conflict with new compiler
-- changed DATASET to H5_TOOLS_DATASET
-- changed DATATYPE to H5_TOOLS _DATATYPE
-- changed GROUP to H5_TOOLS_GROUP
In mingw's version of winsock2.h they define:
typedef unsigned int GROUP;
remove STORAGELAYOUT macro, it was not used
tested: linux
Diffstat (limited to 'tools/h5dump')
| -rw-r--r-- | tools/h5dump/h5dump.c | 6 | ||||
| -rw-r--r-- | tools/h5dump/h5dump.h | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/tools/h5dump/h5dump.c b/tools/h5dump/h5dump.c index 421371b..9a7385f 100644 --- a/tools/h5dump/h5dump.c +++ b/tools/h5dump/h5dump.c @@ -259,13 +259,13 @@ static const h5dump_header_t standardformat = { "", /*fileend */ SUPER_BLOCK, /*bootblockbegin */ "", /*bootblockend */ - GROUP, /*groupbegin */ + H5_TOOLS_GROUP, /*groupbegin */ "", /*groupend */ - DATASET, /*datasetbegin */ + H5_TOOLS_DATASET, /*datasetbegin */ "", /*datasetend */ ATTRIBUTE, /*attributebegin */ "", /*attributeend */ - DATATYPE, /*datatypebegin */ + H5_TOOLS_DATATYPE, /*datatypebegin */ "", /*datatypeend */ DATASPACE, /*dataspacebegin */ "", /*dataspaceend */ diff --git a/tools/h5dump/h5dump.h b/tools/h5dump/h5dump.h index 414ba93..e16705c 100644 --- a/tools/h5dump/h5dump.h +++ b/tools/h5dump/h5dump.h @@ -48,7 +48,6 @@ #define SOFTLINK "SOFTLINK" #define EXTLINK "EXTERNAL_LINK" #define UDLINK "USERDEFINED_LINK" -#define STORAGELAYOUT "STORAGELAYOUT" #define START "START" #define STRIDE "STRIDE" #define STRSIZE "STRSIZE" |