[svn-r5672]

Purpose:
    Code clean up
Description:
    On OSF1 systems compiler complained about NGROUPS variable redefinition.
Solution:
    Rename NGROUPS to H5_NGROUPS
Platforms tested:
    OSF1 V5.1 at PSC

1 files changed, 8 insertions, 8 deletions

diff --git a/test/titerate.c b/test/titerate.c
index 50b0fe4..3d3f279 100644
--- a/test/titerate.c
+++ b/test/titerate.c
@@ -35,7 +35,7 @@
 #define NATTR 50
 
 /* Number of groups for second group iteration test */
-#define NGROUPS 150
+#define H5_NGROUPS 150
 
 /* General maximum length of names used */
 #define NAMELEN     80
@@ -423,7 +423,7 @@ static void test_iter_group_large(void)
     hsize_t		dims[] = {SPACE1_DIM1};
     herr_t		ret;		/* Generic return value		*/
     char gname[20];         /* Temporary group name */
-    iter_info names[NGROUPS+2]; /* Names of objects in the root group */
+    iter_info names[H5_NGROUPS+2]; /* Names of objects in the root group */
     iter_info *curr_name;        /* Pointer to the current name in the root group */
     int                 i;
 
@@ -448,7 +448,7 @@ static void test_iter_group_large(void)
     CHECK(sid, FAIL, "H5Screate_simple");
 
     /* Create a bunch of groups */
-    for (i=0; i<NGROUPS; i++) {
+    for (i=0; i<H5_NGROUPS; i++) {
         sprintf(gname, "Group_%d", i); 
 
         /* Add the name to the list of objects in the root group */
@@ -469,8 +469,8 @@ static void test_iter_group_large(void)
     CHECK(dataset, FAIL, "H5Dcreate");
 
     /* Add the name to the list of objects in the root group */
-    strcpy(names[NGROUPS].name,"Dataset1");
-    names[NGROUPS].type=H5G_DATASET;
+    strcpy(names[H5_NGROUPS].name,"Dataset1");
+    names[H5_NGROUPS].type=H5G_DATASET;
 
     /* Close Dataset */
     ret = H5Dclose(dataset);
@@ -499,15 +499,15 @@ static void test_iter_group_large(void)
     CHECK(ret, FAIL, "H5Tcommit");
 
     /* Add the name to the list of objects in the root group */
-    strcpy(names[NGROUPS+1].name,"Datatype1");
-    names[NGROUPS+1].type=H5G_TYPE;
+    strcpy(names[H5_NGROUPS+1].name,"Datatype1");
+    names[H5_NGROUPS+1].type=H5G_TYPE;
 
     /* Close datatype */
     ret = H5Tclose(tid);
     CHECK(ret, FAIL, "H5Tclose");
 
     /* Need to sort the names in the root group, cause that's what the library does */
-    qsort(names,NGROUPS+2,sizeof(iter_info),iter_strcmp2);
+    qsort(names,H5_NGROUPS+2,sizeof(iter_info),iter_strcmp2);
 
     /* Iterate through the file to see members of the root group */
     curr_name=&names[0];