diff options
| author | Pedro Vicente Nunes <pvn@hdfgroup.org> | 2007-06-18 21:19:47 (GMT) |
|---|---|---|
| committer | Pedro Vicente Nunes <pvn@hdfgroup.org> | 2007-06-18 21:19:47 (GMT) |
| commit | 777565f98b04771cb22c78551ff4a114b636b2cb (patch) | |
| tree | 43682bc6f88fc9c0c6cca14b43d7b9d486eadf6d | |
| parent | ab83950f3edcd6a6d22e3d82b9ff29f1db366d0a (diff) | |
| download | hdf5-777565f98b04771cb22c78551ff4a114b636b2cb.zip hdf5-777565f98b04771cb22c78551ff4a114b636b2cb.tar.gz hdf5-777565f98b04771cb22c78551ff4a114b636b2cb.tar.bz2 | |
[svn-r13875]
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
| -rw-r--r-- | tools/h5dump/h5dump.c | 6 | ||||
| -rw-r--r-- | tools/h5dump/h5dump.h | 1 | ||||
| -rw-r--r-- | tools/lib/h5tools.h | 6 | ||||
| -rw-r--r-- | tools/lib/h5tools_str.c | 6 |
4 files changed, 9 insertions, 10 deletions
diff --git a/tools/h5dump/h5dump.c b/tools/h5dump/h5dump.c index a77e523..0aa17ed 100644 --- a/tools/h5dump/h5dump.c +++ b/tools/h5dump/h5dump.c @@ -261,13 +261,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 2529bf9..a319037 100644 --- a/tools/h5dump/h5dump.h +++ b/tools/h5dump/h5dump.h @@ -46,7 +46,6 @@ #define S_SIMPLE "SIMPLE" #define S_NULL "NULL" #define SOFTLINK "SOFTLINK" -#define STORAGELAYOUT "STORAGELAYOUT" #define START "START" #define STRIDE "STRIDE" #define STRSIZE "STRSIZE" diff --git a/tools/lib/h5tools.h b/tools/lib/h5tools.h index dcb67c0..d798307 100644 --- a/tools/lib/h5tools.h +++ b/tools/lib/h5tools.h @@ -379,9 +379,9 @@ extern int bin_output; /* binary output */ extern int bin_form; /* binary form */ /* Strings for output */ -#define GROUP "GROUP" -#define DATASET "DATASET" -#define DATATYPE "DATATYPE" +#define H5_TOOLS_GROUP "GROUP" +#define H5_TOOLS_DATASET "DATASET" +#define H5_TOOLS_DATATYPE "DATATYPE" /* Definitions of useful routines */ extern void h5tools_init(void); diff --git a/tools/lib/h5tools_str.c b/tools/lib/h5tools_str.c index 2805bd9..237d486 100644 --- a/tools/lib/h5tools_str.c +++ b/tools/lib/h5tools_str.c @@ -879,15 +879,15 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai /* Print object type and close object */ switch (otype) { case H5G_GROUP: - h5tools_str_append(str, GROUP); + h5tools_str_append(str, H5_TOOLS_GROUP); H5Gclose(obj); break; case H5G_DATASET: - h5tools_str_append(str, DATASET); + h5tools_str_append(str, H5_TOOLS_DATASET); H5Dclose(obj); break; case H5G_TYPE: - h5tools_str_append(str, DATATYPE); + h5tools_str_append(str, H5_TOOLS_DATATYPE); H5Tclose(obj); break; default: |