summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorPedro Vicente Nunes <pvn@hdfgroup.org>2007-06-18 20:03:30 (GMT)
committerPedro Vicente Nunes <pvn@hdfgroup.org>2007-06-18 20:03:30 (GMT)
commitd9a56fa9ad4a8fc82eaf7ee91863488adb5a3146 (patch)
tree27e31ca5c3273683f5d420d394f1753b65182720 /tools
parent5e7acfed72dab3bb0a653067b99b18368bdba3f3 (diff)
downloadhdf5-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')
-rw-r--r--tools/h5dump/h5dump.c6
-rw-r--r--tools/h5dump/h5dump.h1
-rw-r--r--tools/lib/h5tools.h6
-rw-r--r--tools/lib/h5tools_str.c6
4 files changed, 9 insertions, 10 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"
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: