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/lib | |
| 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/lib')
| -rw-r--r-- | tools/lib/h5tools.h | 6 | ||||
| -rw-r--r-- | tools/lib/h5tools_str.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/tools/lib/h5tools.h b/tools/lib/h5tools.h index a0f54736..6313992 100644 --- a/tools/lib/h5tools.h +++ b/tools/lib/h5tools.h @@ -380,9 +380,9 @@ 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 57758a1..d00d0e7 100644 --- a/tools/lib/h5tools_str.c +++ b/tools/lib/h5tools_str.c @@ -877,15 +877,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: |