[svn-r7181] Purpose:

    Version update

Description:
    Removed 1.4 compatibility code in the library.

Platforms tested:
    FreeBSD 4.8 (sleipnir)
    h5committest

9 files changed, 12 insertions, 121 deletions

diff --git a/test/dsets.c b/test/dsets.c
index dbe215b..b443ff5 100644
--- a/test/dsets.c
+++ b/test/dsets.c
@@ -114,12 +114,10 @@ double	points_dbl[DSET_DIM1][DSET_DIM2], check_dbl[DSET_DIM1][DSET_DIM2];
 /* Local prototypes for filter functions */
 static size_t filter_bogus(unsigned int flags, size_t cd_nelmts, 
     const unsigned int *cd_values, size_t nbytes, size_t *buf_size, void **buf);
-#ifndef H5_WANT_H5_V1_4_COMPAT
 static herr_t can_apply_bogus(hid_t dcpl_id, hid_t type_id, hid_t space_id);
 static herr_t set_local_bogus2(hid_t dcpl_id, hid_t type_id, hid_t space_id);
 static size_t filter_bogus2(unsigned int flags, size_t cd_nelmts, 
     const unsigned int *cd_values, size_t nbytes, size_t *buf_size, void **buf);
-#endif /* H5_WANT_H5_V1_4_COMPAT */
 static size_t filter_corrupt(unsigned int flags, size_t cd_nelmts, 
     const unsigned int *cd_values, size_t nbytes, size_t *buf_size, void **buf);
 
@@ -332,11 +330,7 @@ test_simple_io(hid_t fapl)
     tconv_buf = malloc (1000);
     xfer = H5Pcreate (H5P_DATASET_XFER);
     assert (xfer>=0);
-#ifdef H5_WANT_H5_V1_4_COMPAT
-    if (H5Pset_buffer (xfer, (hsize_t)1000, tconv_buf, NULL)<0) goto error;
-#else /* H5_WANT_H5_V1_4_COMPAT */
     if (H5Pset_buffer (xfer, (size_t)1000, tconv_buf, NULL)<0) goto error;
-#endif /* H5_WANT_H5_V1_4_COMPAT */
 
     /* Create the dataset */
     if ((dataset = H5Dcreate(file, DSET_SIMPLE_IO_NAME, H5T_NATIVE_INT, space,
@@ -774,11 +768,7 @@ test_conv_buffer(hid_t fid)
     hsize_t     dimsb[1];
     hsize_t     dimsc[1];
     hid_t       xfer_list;
-#ifdef H5_WANT_H5_V1_4_COMPAT
-    hsize_t      size;
-#else /* H5_WANT_H5_V1_4_COMPAT */
     size_t      size;
-#endif /* H5_WANT_H5_V1_4_COMPAT */
 
     TESTING("data type conversion buffer size");
     
@@ -966,7 +956,6 @@ const H5Z_class_t H5Z_BOGUS[1] = {{
     filter_bogus,		/* The actual filter function	*/
 }};
 
-#ifndef H5_WANT_H5_V1_4_COMPAT
 
 /*-------------------------------------------------------------------------
  * Function:	can_apply_bogus
@@ -992,7 +981,6 @@ can_apply_bogus(hid_t UNUSED dcpl_id, hid_t type_id, hid_t UNUSED space_id)
     else
         return 1;
 }
-#endif /* H5_WANT_H5_V1_4_COMPAT */
 
 
 /*-------------------------------------------------------------------------
@@ -1019,7 +1007,6 @@ filter_bogus(unsigned int UNUSED flags, size_t UNUSED cd_nelmts,
     return nbytes;
 }
 
-#ifndef H5_WANT_H5_V1_4_COMPAT
 
 /*-------------------------------------------------------------------------
  * Function:	set_local_bogus2
@@ -1132,7 +1119,6 @@ filter_bogus2(unsigned int flags, size_t cd_nelmts,
     else
         return(nbytes);
 }
-#endif /* H5_WANT_H5_V1_4_COMPAT */
 
 /* This message derives from H5Z */
 const H5Z_class_t H5Z_CORRUPT[1] = {{
@@ -1297,11 +1283,7 @@ test_filter_internal(hid_t fid, const char *name, hid_t dcpl, int if_fletcher32,
      */
     if ((dxpl = H5Pcreate (H5P_DATASET_XFER))<0) goto error;
     tconv_buf = malloc (1000);
-#ifdef H5_WANT_H5_V1_4_COMPAT
-    if (H5Pset_buffer (dxpl, (hsize_t)1000, tconv_buf, NULL)<0) goto error;
-#else /* H5_WANT_H5_V1_4_COMPAT */
     if (H5Pset_buffer (dxpl, (size_t)1000, tconv_buf, NULL)<0) goto error;
-#endif /* H5_WANT_H5_V1_4_COMPAT */
 
     if (if_fletcher32==DISABLE_FLETCHER32) {
         if(H5Pset_edc_check(dxpl, H5Z_DISABLE_EDC)<0)
@@ -1656,11 +1638,7 @@ test_filters(hid_t file)
     puts("Testing 'null' filter");
     if((dc = H5Pcreate(H5P_DATASET_CREATE))<0) goto error;
     if (H5Pset_chunk (dc, 2, chunk_size)<0) goto error;
-#ifdef H5_WANT_H5_V1_4_COMPAT
-    if (H5Zregister (H5Z_FILTER_BOGUS, "bogus", filter_bogus)<0) goto error;
-#else /* H5_WANT_H5_V1_4_COMPAT */
     if (H5Zregister (H5Z_BOGUS)<0) goto error;
-#endif /* H5_WANT_H5_V1_4_COMPAT */
     if (H5Pset_filter (dc, H5Z_FILTER_BOGUS, 0, 0, NULL)<0) goto error;
 
     if(test_filter_internal(file,DSET_BOGUS_NAME,dc,DISABLE_FLETCHER32,DATA_NOT_CORRUPTED,&null_size)<0) goto error;
@@ -1701,11 +1679,7 @@ test_filters(hid_t file)
     data_corrupt[1] = 33;
     data_corrupt[2] = 27;
 
-#ifdef H5_WANT_H5_V1_4_COMPAT
-    if (H5Zregister (H5Z_FILTER_CORRUPT, "corrupt", filter_corrupt)<0) goto error;
-#else /* H5_WANT_H5_V1_4_COMPAT */
     if (H5Zregister (H5Z_CORRUPT)<0) goto error;
-#endif /* H5_WANT_H5_V1_4_COMPAT */
     if (H5Pset_filter (dc, H5Z_FILTER_CORRUPT, 0, 3, data_corrupt)<0) goto error;
     if(test_filter_internal(file,DSET_FLETCHER32_NAME_3,dc,ENABLE_FLETCHER32,DATA_CORRUPTED,&fletcher32_size)<0) goto error;
     if(fletcher32_size<=null_size) {
@@ -2395,7 +2369,6 @@ test_types(hid_t file)
     return -1;
 }
 
-#ifndef H5_WANT_H5_V1_4_COMPAT
 /* This message derives from H5Z */
 const H5Z_class_t H5Z_CAN_APPLY[1] = {{
     H5Z_FILTER_BOGUS,		/* Filter id number		*/
@@ -2559,7 +2532,6 @@ test_can_apply(hid_t file)
 error:
     return -1;
 } /* end test_can_apply() */
-#endif /* H5_WANT_H5_V1_4_COMPAT */
 
 
 /*-------------------------------------------------------------------------
@@ -2689,7 +2661,6 @@ error:
 #endif /* H5_HAVE_FILTER_SZIP */
 } /* end test_can_apply_szip() */
 
-#ifndef H5_WANT_H5_V1_4_COMPAT
 /* This message derives from H5Z */
 const H5Z_class_t H5Z_SET_LOCAL[1] = {{
     H5Z_FILTER_BOGUS2,		/* Filter id number		*/
@@ -2960,7 +2931,6 @@ test_set_local(hid_t fapl)
 error:
     return -1;
 } /* end test_set_local() */
-#endif /* H5_WANT_H5_V1_4_COMPAT */
 
 
 /*-------------------------------------------------------------------------
@@ -3024,10 +2994,8 @@ main(void)
     nerrors += test_types(file)<0       ?1:0;
     nerrors += test_userblock_offset(fapl)<0     ?1:0;
     nerrors += test_missing_filter(file)<0	?1:0;
-#ifndef H5_WANT_H5_V1_4_COMPAT
     nerrors += test_can_apply(file)<0	?1:0; 
     nerrors += test_set_local(fapl)<0	?1:0;
-#endif /* H5_WANT_H5_V1_4_COMPAT */
     nerrors += test_can_apply_szip(file)<0	?1:0; 
 
     if (H5Fclose(file)<0) goto error;
diff --git a/test/h5test.c b/test/h5test.c
index ccee874..a5cbad8 100644
--- a/test/h5test.c
+++ b/test/h5test.c
@@ -436,11 +436,7 @@ h5_fileaccess(void)
     char s[1024];
     hid_t fapl = -1;
     hsize_t fam_size = 100*1024*1024; /*100 MB*/
-#ifdef H5_WANT_H5_V1_4_COMPAT
-    long verbosity = 1;
-#else /* H5_WANT_H5_V1_4_COMPAT */
     long log_flags = H5FD_LOG_LOC_IO;
-#endif /* H5_WANT_H5_V1_4_COMPAT */
     H5FD_mem_t	mt;
     
     /* First use the environment variable, then the constant */
@@ -503,21 +499,12 @@ h5_fileaccess(void)
 	}
 	if (H5Pset_fapl_family(fapl, fam_size, H5P_DEFAULT)<0) return -1;
     } else if (!HDstrcmp(name, "log")) {
-#ifdef H5_WANT_H5_V1_4_COMPAT
-        /* Log file access */
-        if ((val = strtok(NULL, " \t\n\r")))
-            verbosity = strtol(val, NULL, 0);
-
-        if (H5Pset_fapl_log(fapl, NULL, (int)verbosity) < 0)
-	    return -1;
-#else /* H5_WANT_H5_V1_4_COMPAT */
         /* Log file access */
         if ((val = HDstrtok(NULL, " \t\n\r")))
             log_flags = HDstrtol(val, NULL, 0);
 
         if (H5Pset_fapl_log(fapl, NULL, (unsigned)log_flags, 0) < 0)
 	    return -1;
-#endif /* H5_WANT_H5_V1_4_COMPAT */
     } else {
 	/* Unknown driver */
 	return -1;
diff --git a/test/ntypes.c b/test/ntypes.c
index bd87f12..ce002af 100644
--- a/test/ntypes.c
+++ b/test/ntypes.c
@@ -1730,13 +1730,8 @@ test_refer_dtype(hid_t file)
     /* Create reference to named datatype */
     if(H5Rcreate(wbuf,file,"/Group1/Datatype1",H5R_OBJECT,-1)<0) 
         TEST_ERROR;
-#ifdef H5_WANT_H5_V1_4_COMPAT
-    if(H5Rget_object_type(dataset,wbuf)!=H5G_TYPE)
-        TEST_ERROR;
-#else /* H5_WANT_H5_V1_4_COMPAT */
     if(H5Rget_obj_type(dataset,H5R_OBJECT,wbuf)!=H5G_TYPE)
         TEST_ERROR;
-#endif /* H5_WANT_H5_V1_4_COMPAT */
 
     /* Write selection to disk */
     if(H5Dwrite(dataset,H5T_STD_REF_OBJ,H5S_ALL,H5S_ALL,H5P_DEFAULT,wbuf)<0)
diff --git a/test/tfile.c b/test/tfile.c
index 45d6ca7..c285351 100644
--- a/test/tfile.c
+++ b/test/tfile.c
@@ -80,11 +80,7 @@ test_file_create(void)
     size_t		parm;		/*file-creation parameters	*/
     size_t		parm2;		/*file-creation parameters	*/
     int			iparm;
-#ifdef H5_WANT_H5_V1_4_COMPAT
-    int		iparm2;
-#else /* H5_WANT_H5_V1_4_COMPAT */
     unsigned		iparm2;
-#endif /* H5_WANT_H5_V1_4_COMPAT */
     herr_t		ret;		/*generic return value		*/
 
     /* Output message about test being performed */
@@ -319,11 +315,7 @@ test_file_open(void)
     size_t		parm;		/*file-creation parameters	*/
     size_t		parm2;		/*file-creation parameters	*/
     int			iparm;
-#ifdef H5_WANT_H5_V1_4_COMPAT
-    int		iparm2;
-#else /* H5_WANT_H5_V1_4_COMPAT */
     unsigned		iparm2;
-#endif /* H5_WANT_H5_V1_4_COMPAT */
     herr_t		ret;		/*generic return value		*/
 
     /*
diff --git a/test/titerate.c b/test/titerate.c
index a64bfbb..e8d0e3a 100644
--- a/test/titerate.c
+++ b/test/titerate.c
@@ -197,11 +197,13 @@ static void test_iter_group(void)
         VERIFY(num_membs,NDATASETS+2,"H5Gget_num_objs");
   
         for(i=0; i< (int)num_membs; i++) {
+            H5G_obj_t obj_type;         /* Type of object in file */
+
             ret = H5Gget_objname_by_idx(root_group, (hsize_t)i, dataset_name, 32);
             CHECK(ret, FAIL, "H5Gget_objsname_by_idx");
             
-            ret = (herr_t)H5Gget_objtype_by_idx(root_group, (hsize_t)i);
-            CHECK(ret, FAIL, "H5Gget_objsname_by_idx");
+            obj_type = H5Gget_objtype_by_idx(root_group, (hsize_t)i);
+            CHECK(obj_type, H5G_UNKNOWN, "H5Gget_objsname_by_idx");
         }
     
         H5E_BEGIN_TRY {
@@ -780,22 +782,24 @@ static void test_grp_memb_funcs(void)
     VERIFY(num_membs,NDATASETS+2,"H5Gget_num_objs");
   
     for(i=0; i< (int)num_membs; i++) {
-        ret = (herr_t)H5Gget_objname_by_idx(root_group, (hsize_t)i, dataset_name, 32);
+        H5G_obj_t obj_type;         /* Type of object in file */
+
+        ret = H5Gget_objname_by_idx(root_group, (hsize_t)i, dataset_name, 32);
         CHECK(ret, FAIL, "H5Gget_objsname_by_idx");
         
         /* Keep a copy of the dataset names around for later */
         obj_names[i]=HDstrdup(dataset_name);
         CHECK(dnames[i], NULL, "strdup");           
         
-        ret = (herr_t)H5Gget_objtype_by_idx(root_group, (hsize_t)i);
-        CHECK(ret, FAIL, "H5Gget_objsname_by_idx");
+        obj_type = H5Gget_objtype_by_idx(root_group, (hsize_t)i);
+        CHECK(obj_type, H5G_UNKNOWN, "H5Gget_objsname_by_idx");
 
         if(!HDstrcmp(dataset_name, "grp"))
-            VERIFY(ret, H5G_GROUP, "H5Gget_objsname_by_idx");
+            VERIFY(obj_type, H5G_GROUP, "H5Gget_objsname_by_idx");
         if(!HDstrcmp(dataset_name, "dtype"))
-            VERIFY(ret, H5G_TYPE, "H5Gget_objsname_by_idx");
+            VERIFY(obj_type, H5G_TYPE, "H5Gget_objsname_by_idx");
         if(!HDstrncmp(dataset_name, "Dataset", 7))
-            VERIFY(ret, H5G_DATASET, "H5Gget_objsname_by_idx");
+            VERIFY(obj_type, H5G_DATASET, "H5Gget_objsname_by_idx");
     }
     
     H5E_BEGIN_TRY {
diff --git a/test/tmisc.c b/test/tmisc.c
index 7b82273..f039cb6 100644
--- a/test/tmisc.c
+++ b/test/tmisc.c
@@ -1062,11 +1062,7 @@ test_misc8(void)
 #endif /* VERIFY_DATA */
     unsigned u,v;               /* Local index variables */
     int mdc_nelmts;             /* Metadata number of elements */
-#ifdef H5_WANT_H5_V1_4_COMPAT
-    int rdcc_nelmts;            /* Raw data number of elements */
-#else /* H5_WANT_H5_V1_4_COMPAT */
     size_t rdcc_nelmts;         /* Raw data number of elements */
-#endif /* H5_WANT_H5_V1_4_COMPAT */
     size_t rdcc_nbytes;         /* Raw data number of bytes */
     double rdcc_w0;             /* Raw data write percentage */
     hssize_t start[MISC8_RANK]; /* Hyperslab start */
diff --git a/test/trefer.c b/test/trefer.c
index 7a94d62..6183c88 100644
--- a/test/trefer.c
+++ b/test/trefer.c
@@ -162,46 +162,26 @@ test_reference_obj(void)
     /* Create reference to dataset */
     ret = H5Rcreate(&wbuf[0],fid1,"/Group1/Dataset1",H5R_OBJECT,-1);
     CHECK(ret, FAIL, "H5Rcreate");
-#ifdef H5_WANT_H5_V1_4_COMPAT
-    ret = H5Rget_object_type(dataset,&wbuf[0]);
-    VERIFY(ret, H5G_DATASET, "H5Rget_object_type");
-#else /* H5_WANT_H5_V1_4_COMPAT */
     ret = H5Rget_obj_type(dataset,H5R_OBJECT,&wbuf[0]);
     VERIFY(ret, H5G_DATASET, "H5Rget_obj_type");
-#endif /* H5_WANT_H5_V1_4_COMPAT */
 
     /* Create reference to dataset */
     ret = H5Rcreate(&wbuf[1],fid1,"/Group1/Dataset2",H5R_OBJECT,-1);
     CHECK(ret, FAIL, "H5Rcreate");
-#ifdef H5_WANT_H5_V1_4_COMPAT
-    ret = H5Rget_object_type(dataset,&wbuf[1]);
-    VERIFY(ret, H5G_DATASET, "H5Rget_object_type");
-#else /* H5_WANT_H5_V1_4_COMPAT */
     ret = H5Rget_obj_type(dataset,H5R_OBJECT,&wbuf[1]);
     VERIFY(ret, H5G_DATASET, "H5Rget_obj_type");
-#endif /* H5_WANT_H5_V1_4_COMPAT */
 
     /* Create reference to group */
     ret = H5Rcreate(&wbuf[2],fid1,"/Group1",H5R_OBJECT,-1);
     CHECK(ret, FAIL, "H5Rcreate");
-#ifdef H5_WANT_H5_V1_4_COMPAT
-    ret = H5Rget_object_type(dataset,&wbuf[2]);
-    VERIFY(ret, H5G_GROUP, "H5Rget_object_type");
-#else /* H5_WANT_H5_V1_4_COMPAT */
     ret = H5Rget_obj_type(dataset,H5R_OBJECT,&wbuf[2]);
     VERIFY(ret, H5G_GROUP, "H5Rget_obj_type");
-#endif /* H5_WANT_H5_V1_4_COMPAT */
 
     /* Create reference to named datatype */
     ret = H5Rcreate(&wbuf[3],fid1,"/Group1/Datatype1",H5R_OBJECT,-1);
     CHECK(ret, FAIL, "H5Rcreate");
-#ifdef H5_WANT_H5_V1_4_COMPAT
-    ret = H5Rget_object_type(dataset,&wbuf[3]);
-    VERIFY(ret, H5G_TYPE, "H5Rget_object_type");
-#else /* H5_WANT_H5_V1_4_COMPAT */
     ret = H5Rget_obj_type(dataset,H5R_OBJECT,&wbuf[3]);
     VERIFY(ret, H5G_TYPE, "H5Rget_obj_type");
-#endif /* H5_WANT_H5_V1_4_COMPAT */
 
     /* Write selection to disk */
     ret=H5Dwrite(dataset,H5T_STD_REF_OBJ,H5S_ALL,H5S_ALL,H5P_DEFAULT,wbuf);
@@ -326,13 +306,8 @@ test_reference_region(void)
     hsize_t		block[SPACE2_RANK];     /* Block size of hyperslab */
     hssize_t	coord1[POINT1_NPOINTS][SPACE2_RANK]; /* Coordinates for point selection */
     hsize_t *   coords;             /* Coordinate buffer */
-#ifdef H5_WANT_H5_V1_4_COMPAT
-    hsize_t		low[SPACE2_RANK];   /* Selection bounds */
-    hsize_t		high[SPACE2_RANK];     /* Selection bounds */
-#else /* H5_WANT_H5_V1_4_COMPAT */
     hssize_t		low[SPACE2_RANK];   /* Selection bounds */
     hssize_t		high[SPACE2_RANK];     /* Selection bounds */
-#endif /* H5_WANT_H5_V1_4_COMPAT */
     hdset_reg_ref_t      *wbuf,      /* buffer to write to disk */
                *rbuf;       /* buffer read from disk */
     uint8_t    *dwbuf,      /* Buffer for writing numeric data to disk */
@@ -882,13 +857,8 @@ test_reference_obj_deleted(void)
     /* Create reference to dataset */
     ret = H5Rcreate(&oref,fid1,"/Dataset1",H5R_OBJECT,-1);
     CHECK(ret, FAIL, "H5Rcreate");
-#ifdef H5_WANT_H5_V1_4_COMPAT
-    ret = H5Rget_object_type(dataset,&oref);
-    VERIFY(ret, H5G_DATASET, "H5Rget_object_type");
-#else /* H5_WANT_H5_V1_4_COMPAT */
     ret = H5Rget_obj_type(dataset,H5R_OBJECT,&oref);
     VERIFY(ret, H5G_DATASET, "H5Rget_obj_type");
-#endif /* H5_WANT_H5_V1_4_COMPAT */
 
     /* Write selection to disk */
     ret=H5Dwrite(dataset,H5T_STD_REF_OBJ,H5S_ALL,H5S_ALL,H5P_DEFAULT,&oref);
diff --git a/test/tselect.c b/test/tselect.c
index 6e4c07d..59150f4 100644
--- a/test/tselect.c
+++ b/test/tselect.c
@@ -2522,11 +2522,6 @@ test_select_hyper_union(void)
     xfer = H5Pcreate (H5P_DATASET_XFER);
     CHECK(xfer, FAIL, "H5Pcreate");
 
-#ifdef H5_WANT_H5_V1_4_COMPAT
-    ret = H5Pset_hyper_cache(xfer,0,1);
-    CHECK(ret, FAIL, "H5Pset_hyper_cache");
-#endif /* H5_WANT_H5_V1_4_COMPAT */
-
     /* Write selection to disk */
     ret=H5Dwrite(dataset,H5T_NATIVE_UCHAR,sid2,sid1,xfer,wbuf);
     CHECK(ret, FAIL, "H5Dwrite");
@@ -6155,11 +6150,7 @@ test_select(void)
     hid_t plist_id;     /* Property list for reading random hyperslabs */
     hid_t fapl;         /* Property list accessing the file */
     int mdc_nelmts;     /* Metadata number of elements */
-#ifdef H5_WANT_H5_V1_4_COMPAT
-    int rdcc_nelmts;   /* Raw data number of elements */
-#else /* H5_WANT_H5_V1_4_COMPAT */
     size_t rdcc_nelmts;   /* Raw data number of elements */
-#endif /* H5_WANT_H5_V1_4_COMPAT */
     size_t rdcc_nbytes; /* Raw data number of bytes */
     double rdcc_w0;     /* Raw data write percentage */
     hssize_t offset[SPACE7_RANK]={1,1}; /* Offset for testing selection offsets */
@@ -6173,11 +6164,7 @@ test_select(void)
     CHECK(plist_id, FAIL, "H5Pcreate");
 
     /* test I/O with a very small buffer for reads */
-#ifdef H5_WANT_H5_V1_4_COMPAT
-    ret=H5Pset_buffer(plist_id,(hsize_t)59,NULL,NULL);
-#else /* H5_WANT_H5_V1_4_COMPAT */
     ret=H5Pset_buffer(plist_id,(size_t)59,NULL,NULL);
-#endif /* H5_WANT_H5_V1_4_COMPAT */
     CHECK(ret, FAIL, "H5Pset_buffer");
 
     /* These next tests use the same file */
diff --git a/test/unlink.c b/test/unlink.c
index 6d8be55..05d8831 100644
--- a/test/unlink.c
+++ b/test/unlink.c
@@ -527,11 +527,7 @@ test_filespace(void)
 
     /* Metadata cache parameters */
     int mdc_nelmts;
-#ifdef H5_WANT_H5_V1_4_COMPAT
-    int rdcc_nelmts;
-#else /* H5_WANT_H5_V1_4_COMPAT */
     size_t rdcc_nelmts;
-#endif /* H5_WANT_H5_V1_4_COMPAT */
     size_t rdcc_nbytes;
     double rdcc_w0;
 
@@ -1326,11 +1322,7 @@ main(void)
 
     /* Metadata cache parameters */
     int mdc_nelmts;
-#ifdef H5_WANT_H5_V1_4_COMPAT
-    int rdcc_nelmts;
-#else /* H5_WANT_H5_V1_4_COMPAT */
     size_t rdcc_nelmts;
-#endif /* H5_WANT_H5_V1_4_COMPAT */
     size_t rdcc_nbytes;
     double rdcc_w0;