summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Lu <ptlu@hawkwind.ncsa.uiuc.edu>1998-11-17 18:18:57 (GMT)
committerPatrick Lu <ptlu@hawkwind.ncsa.uiuc.edu>1998-11-17 18:18:57 (GMT)
commite4d2a0ae94241751c04827edf82ee223715bd24d (patch)
tree59a96f25f7a5b0996e79e9b4b2e921ba34482185
parentfbedc4bfeb80bd1a489c0c8d63848174ab3c28bb (diff)
downloadhdf5-e4d2a0ae94241751c04827edf82ee223715bd24d.zip
hdf5-e4d2a0ae94241751c04827edf82ee223715bd24d.tar.gz
hdf5-e4d2a0ae94241751c04827edf82ee223715bd24d.tar.bz2
[svn-r920] changed the GROUP macro to be GROUPNAME since GROUP was used by the winsock2.h
file
-rw-r--r--tools/h5dump.c4
-rw-r--r--tools/h5dump.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/tools/h5dump.c b/tools/h5dump.c
index d29696d..7c8d922 100644
--- a/tools/h5dump.c
+++ b/tools/h5dump.c
@@ -772,7 +772,7 @@ int i;
indentation (indent);
- begin_obj(GROUP, name);
+ begin_obj(GROUPNAME, name);
indent += col;
if (!strcmp(name,"/") && unamedtype) { /* dump unamed type in root group */
@@ -1439,7 +1439,7 @@ H5Eset_auto (NULL, NULL);
curr_arg < ((i+1)==nopts?(argc-1):opts[i+1]);
curr_arg++) {
if ((gid = H5Gopen (fid, argv[curr_arg])) < 0) {
- begin_obj (GROUP, argv[curr_arg]);
+ begin_obj (GROUPNAME, argv[curr_arg]);
indentation (col);
fprintf (stdout, "h5dump error: unable to open %s\n",
argv[curr_arg]);
diff --git a/tools/h5dump.h b/tools/h5dump.h
index 2af2d04..02b3166 100644
--- a/tools/h5dump.h
+++ b/tools/h5dump.h
@@ -4,7 +4,7 @@
#include <hdf5.h>
#define BOOT_BLOCK "BOOT_BLOCK"
-#define GROUP "GROUP"
+#define GROUPNAME "GROUP"
#define DATASET "DATASET"
#define ATTRIBUTE "ATTRIBUTE"
#define DATATYPE "DATATYPE"