[svn-r17141] Description:

	Change name of public 'H5D_CHUNK_BTREE' symbol (indicating the type
of index used for locating chunks) to 'H5D_CHUNK_IDX_BTREE', putting old name
in "deprecated symbols" section.  This will make adding new indices (like
extensible and fixed arrays) more nicely named.

Tested on:
	FreeBSD/32 6.3 (duty)
	(h5commitest not required on branch)

8 files changed, 62 insertions, 61 deletions

diff --git a/src/H5Dbtree.c b/src/H5Dbtree.c
index 1195c80..ae96613 100644
--- a/src/H5Dbtree.c
+++ b/src/H5Dbtree.c
@@ -238,7 +238,7 @@ H5D_btree_get_shared(const H5F_t UNUSED *f, const void *_udata)
 
     HDassert(udata);
     HDassert(udata->mesg);
-    HDassert(udata->mesg->u.chunk.idx_type == H5D_CHUNK_BTREE);
+    HDassert(udata->mesg->u.chunk.idx_type == H5D_CHUNK_IDX_BTREE);
     HDassert(udata->mesg->u.chunk.u.btree.shared);
 
     /* Increment reference count on B-tree info */
diff --git a/src/H5Dchunk.c b/src/H5Dchunk.c
index d052ff1..1a96d61 100644
--- a/src/H5Dchunk.c
+++ b/src/H5Dchunk.c
@@ -379,9 +379,9 @@ H5D_chunk_init(H5F_t *f, hid_t dxpl_id, const H5D_t *dset, hid_t dapl_id)
     /* Sanity check */
     HDassert(f);
     HDassert(dset);
-    HDassert((H5D_CHUNK_EARRAY == dset->shared->layout.u.chunk.idx_type && 
+    HDassert((H5D_CHUNK_IDX_EARRAY == dset->shared->layout.u.chunk.idx_type && 
                 H5D_COPS_EARRAY == dset->shared->layout.u.chunk.ops) ||
-            (H5D_CHUNK_BTREE == dset->shared->layout.u.chunk.idx_type && 
+            (H5D_CHUNK_IDX_BTREE == dset->shared->layout.u.chunk.idx_type && 
                 H5D_COPS_BTREE == dset->shared->layout.u.chunk.ops));
 
     if(NULL == (dapl = (H5P_genplist_t *)H5I_object(dapl_id)))
@@ -451,9 +451,9 @@ H5D_chunk_is_space_alloc(const H5O_layout_t *layout)
 
     /* Sanity checks */
     HDassert(layout);
-    HDassert((H5D_CHUNK_EARRAY == layout->u.chunk.idx_type && 
+    HDassert((H5D_CHUNK_IDX_EARRAY == layout->u.chunk.idx_type && 
                 H5D_COPS_EARRAY == layout->u.chunk.ops) ||
-            (H5D_CHUNK_BTREE == layout->u.chunk.idx_type && 
+            (H5D_CHUNK_IDX_BTREE == layout->u.chunk.idx_type && 
                 H5D_COPS_BTREE == layout->u.chunk.ops));
 
     /* Query index layer */
@@ -1932,9 +1932,9 @@ H5D_chunk_idx_reset(H5O_layout_t *layout, hbool_t reset_addr)
     /* Sanity checks */
     HDassert(layout);
     HDassert(layout->u.chunk.ops);
-    HDassert((H5D_CHUNK_EARRAY == layout->u.chunk.idx_type && 
+    HDassert((H5D_CHUNK_IDX_EARRAY == layout->u.chunk.idx_type && 
                 H5D_COPS_EARRAY == layout->u.chunk.ops) ||
-            (H5D_CHUNK_BTREE == layout->u.chunk.idx_type && 
+            (H5D_CHUNK_IDX_BTREE == layout->u.chunk.idx_type && 
                 H5D_COPS_BTREE == layout->u.chunk.ops));
 
     /* Reset index structures */
@@ -2087,9 +2087,9 @@ H5D_chunk_create(H5D_t *dset /*in,out*/, hid_t dxpl_id)
     HDassert(dset);
     HDassert(H5D_CHUNKED == dset->shared->layout.type);
     HDassert(dset->shared->layout.u.chunk.ndims > 0 && dset->shared->layout.u.chunk.ndims <= H5O_LAYOUT_NDIMS);
-    HDassert((H5D_CHUNK_EARRAY == dset->shared->layout.u.chunk.idx_type && 
+    HDassert((H5D_CHUNK_IDX_EARRAY == dset->shared->layout.u.chunk.idx_type && 
                 H5D_COPS_EARRAY == dset->shared->layout.u.chunk.ops) ||
-            (H5D_CHUNK_BTREE == dset->shared->layout.u.chunk.idx_type && 
+            (H5D_CHUNK_IDX_BTREE == dset->shared->layout.u.chunk.idx_type && 
                 H5D_COPS_BTREE == dset->shared->layout.u.chunk.ops));
 #ifndef NDEBUG
 {
@@ -2139,9 +2139,9 @@ H5D_chunk_get_info(const H5D_t *dset, hid_t dxpl_id, const hsize_t *chunk_offset
 
     HDassert(dset);
     HDassert(dset->shared->layout.u.chunk.ndims > 0);
-    HDassert((H5D_CHUNK_EARRAY == dset->shared->layout.u.chunk.idx_type && 
+    HDassert((H5D_CHUNK_IDX_EARRAY == dset->shared->layout.u.chunk.idx_type && 
                 H5D_COPS_EARRAY == dset->shared->layout.u.chunk.ops) ||
-            (H5D_CHUNK_BTREE == dset->shared->layout.u.chunk.idx_type && 
+            (H5D_CHUNK_IDX_BTREE == dset->shared->layout.u.chunk.idx_type && 
                 H5D_COPS_BTREE == dset->shared->layout.u.chunk.ops));
     HDassert(chunk_offset);
     HDassert(udata);
@@ -2205,9 +2205,9 @@ H5D_chunk_flush_entry(const H5D_t *dset, hid_t dxpl_id, const H5D_dxpl_cache_t *
 
     HDassert(dset);
     HDassert(dset->shared);
-    HDassert((H5D_CHUNK_EARRAY == dset->shared->layout.u.chunk.idx_type && 
+    HDassert((H5D_CHUNK_IDX_EARRAY == dset->shared->layout.u.chunk.idx_type && 
                 H5D_COPS_EARRAY == dset->shared->layout.u.chunk.ops) ||
-            (H5D_CHUNK_BTREE == dset->shared->layout.u.chunk.idx_type && 
+            (H5D_CHUNK_IDX_BTREE == dset->shared->layout.u.chunk.idx_type && 
                 H5D_COPS_BTREE == dset->shared->layout.u.chunk.ops));
     HDassert(dxpl_cache);
     HDassert(ent);
@@ -3004,9 +3004,9 @@ H5D_chunk_allocated(H5D_t *dset, hid_t dxpl_id, hsize_t *nbytes)
 
     HDassert(dset);
     HDassert(dset->shared);
-    HDassert((H5D_CHUNK_EARRAY == dset->shared->layout.u.chunk.idx_type && 
+    HDassert((H5D_CHUNK_IDX_EARRAY == dset->shared->layout.u.chunk.idx_type && 
                 H5D_COPS_EARRAY == dset->shared->layout.u.chunk.ops) ||
-            (H5D_CHUNK_BTREE == dset->shared->layout.u.chunk.idx_type && 
+            (H5D_CHUNK_IDX_BTREE == dset->shared->layout.u.chunk.idx_type && 
                 H5D_COPS_BTREE == dset->shared->layout.u.chunk.ops));
 
     /* Fill the DXPL cache values for later use */
@@ -3087,9 +3087,9 @@ H5D_chunk_allocate(H5D_t *dset, hid_t dxpl_id, hbool_t full_overwrite)
     /* Check args */
     HDassert(dset && H5D_CHUNKED == layout->type);
     HDassert(layout->u.chunk.ndims > 0 && layout->u.chunk.ndims <= H5O_LAYOUT_NDIMS);
-    HDassert((H5D_CHUNK_EARRAY == layout->u.chunk.idx_type && 
+    HDassert((H5D_CHUNK_IDX_EARRAY == layout->u.chunk.idx_type && 
                 H5D_COPS_EARRAY == layout->u.chunk.ops) ||
-            (H5D_CHUNK_BTREE == layout->u.chunk.idx_type && 
+            (H5D_CHUNK_IDX_BTREE == layout->u.chunk.idx_type && 
                 H5D_COPS_BTREE == layout->u.chunk.ops));
     HDassert(TRUE == H5P_isa_class(dxpl_id, H5P_DATASET_XFER));
 
@@ -3663,9 +3663,9 @@ H5D_chunk_prune_by_extent(H5D_t *dset, hid_t dxpl_id, const hsize_t *old_dims)
     /* Check args */
     HDassert(dset && H5D_CHUNKED == layout->type);
     HDassert(layout->u.chunk.ndims > 0 && layout->u.chunk.ndims <= H5O_LAYOUT_NDIMS);
-    HDassert((H5D_CHUNK_EARRAY == layout->u.chunk.idx_type && 
+    HDassert((H5D_CHUNK_IDX_EARRAY == layout->u.chunk.idx_type && 
                 H5D_COPS_EARRAY == layout->u.chunk.ops) ||
-            (H5D_CHUNK_BTREE == layout->u.chunk.idx_type && 
+            (H5D_CHUNK_IDX_BTREE == layout->u.chunk.idx_type && 
                 H5D_COPS_BTREE == layout->u.chunk.ops));
     HDassert(dxpl_cache);
 
@@ -3905,9 +3905,9 @@ H5D_chunk_addrmap(const H5D_io_info_t *io_info, haddr_t chunk_addr[],
 
     HDassert(dset);
     HDassert(dset->shared);
-    HDassert((H5D_CHUNK_EARRAY == dset->shared->layout.u.chunk.idx_type && 
+    HDassert((H5D_CHUNK_IDX_EARRAY == dset->shared->layout.u.chunk.idx_type && 
                 H5D_COPS_EARRAY == dset->shared->layout.u.chunk.ops) ||
-            (H5D_CHUNK_BTREE == dset->shared->layout.u.chunk.idx_type && 
+            (H5D_CHUNK_IDX_BTREE == dset->shared->layout.u.chunk.idx_type && 
                 H5D_COPS_BTREE == dset->shared->layout.u.chunk.ops));
     HDassert(chunk_addr);
     HDassert(down_chunks);
@@ -3960,9 +3960,9 @@ H5D_chunk_delete(H5F_t *f, hid_t dxpl_id, H5O_t *oh, H5O_layout_t *layout)
     HDassert(f);
     HDassert(oh);
     HDassert(layout);
-    HDassert((H5D_CHUNK_EARRAY == layout->u.chunk.idx_type && 
+    HDassert((H5D_CHUNK_IDX_EARRAY == layout->u.chunk.idx_type && 
                 H5D_COPS_EARRAY == layout->u.chunk.ops) ||
-            (H5D_CHUNK_BTREE == layout->u.chunk.idx_type && 
+            (H5D_CHUNK_IDX_BTREE == layout->u.chunk.idx_type && 
                 H5D_COPS_BTREE == layout->u.chunk.ops));
 
     /* Check for I/O pipeline message */
@@ -4310,14 +4310,14 @@ H5D_chunk_copy(H5F_t *f_src, H5O_layout_t *layout_src, H5F_t *f_dst,
     HDassert(f_src);
     HDassert(f_dst);
     HDassert(layout_src && H5D_CHUNKED == layout_src->type);
-    HDassert((H5D_CHUNK_EARRAY == layout_src->u.chunk.idx_type && 
+    HDassert((H5D_CHUNK_IDX_EARRAY == layout_src->u.chunk.idx_type && 
                 H5D_COPS_EARRAY == layout_src->u.chunk.ops) ||
-            (H5D_CHUNK_BTREE == layout_src->u.chunk.idx_type && 
+            (H5D_CHUNK_IDX_BTREE == layout_src->u.chunk.idx_type && 
                 H5D_COPS_BTREE == layout_src->u.chunk.ops));
     HDassert(layout_dst && H5D_CHUNKED == layout_dst->type);
-    HDassert((H5D_CHUNK_EARRAY == layout_dst->u.chunk.idx_type && 
+    HDassert((H5D_CHUNK_IDX_EARRAY == layout_dst->u.chunk.idx_type && 
                 H5D_COPS_EARRAY == layout_dst->u.chunk.ops) ||
-            (H5D_CHUNK_BTREE == layout_dst->u.chunk.idx_type && 
+            (H5D_CHUNK_IDX_BTREE == layout_dst->u.chunk.idx_type && 
                 H5D_COPS_BTREE == layout_dst->u.chunk.ops));
     HDassert(dt_src);
 
@@ -4526,9 +4526,9 @@ H5D_chunk_bh_info(H5F_t *f, hid_t dxpl_id, H5O_layout_t *layout,
     /* Check args */
     HDassert(f);
     HDassert(layout);
-    HDassert((H5D_CHUNK_EARRAY == layout->u.chunk.idx_type && 
+    HDassert((H5D_CHUNK_IDX_EARRAY == layout->u.chunk.idx_type && 
                 H5D_COPS_EARRAY == layout->u.chunk.ops) ||
-            (H5D_CHUNK_BTREE == layout->u.chunk.idx_type && 
+            (H5D_CHUNK_IDX_BTREE == layout->u.chunk.idx_type && 
                 H5D_COPS_BTREE == layout->u.chunk.ops));
     HDassert(pline);
     HDassert(index_size);
@@ -4617,9 +4617,9 @@ H5D_chunk_dump_index(H5D_t *dset, hid_t dxpl_id, FILE *stream)
 
     /* Sanity check */
     HDassert(dset);
-    HDassert((H5D_CHUNK_EARRAY == dset->shared->layout.u.chunk.idx_type && 
+    HDassert((H5D_CHUNK_IDX_EARRAY == dset->shared->layout.u.chunk.idx_type && 
                 H5D_COPS_EARRAY == dset->shared->layout.u.chunk.ops) ||
-            (H5D_CHUNK_BTREE == dset->shared->layout.u.chunk.idx_type && 
+            (H5D_CHUNK_IDX_BTREE == dset->shared->layout.u.chunk.idx_type && 
                 H5D_COPS_BTREE == dset->shared->layout.u.chunk.ops));
 
     /* Only display info if stream is defined */
@@ -4680,9 +4680,9 @@ H5D_chunk_dest(H5F_t *f, hid_t dxpl_id, H5D_t *dset)
 
     HDassert(f);
     HDassert(dset);
-    HDassert((H5D_CHUNK_EARRAY == dset->shared->layout.u.chunk.idx_type && 
+    HDassert((H5D_CHUNK_IDX_EARRAY == dset->shared->layout.u.chunk.idx_type && 
                 H5D_COPS_EARRAY == dset->shared->layout.u.chunk.ops) ||
-            (H5D_CHUNK_BTREE == dset->shared->layout.u.chunk.idx_type && 
+            (H5D_CHUNK_IDX_BTREE == dset->shared->layout.u.chunk.idx_type && 
                 H5D_COPS_BTREE == dset->shared->layout.u.chunk.ops));
 
     /* Fill the DXPL cache values for later use */
diff --git a/src/H5Dearray.c b/src/H5Dearray.c
index a1271f4..b1333f4 100644
--- a/src/H5Dearray.c
+++ b/src/H5Dearray.c
@@ -626,7 +626,7 @@ H5D_earray_idx_depend(const H5D_chk_idx_info_t *idx_info)
     HDassert(H5F_INTENT(idx_info->f) & H5F_ACC_SWMR_WRITE);
     HDassert(idx_info->pline);
     HDassert(idx_info->layout);
-    HDassert(H5D_CHUNK_EARRAY == idx_info->layout->u.chunk.idx_type);
+    HDassert(H5D_CHUNK_IDX_EARRAY == idx_info->layout->u.chunk.idx_type);
     HDassert(H5F_addr_defined(idx_info->layout->u.chunk.u.earray.addr));
     HDassert(idx_info->layout->u.chunk.u.earray.ea);
 
@@ -681,7 +681,7 @@ H5D_earray_idx_undepend(const H5D_chk_idx_info_t *idx_info)
     HDassert(H5F_INTENT(idx_info->f) & H5F_ACC_SWMR_WRITE);
     HDassert(idx_info->pline);
     HDassert(idx_info->layout);
-    HDassert(H5D_CHUNK_EARRAY == idx_info->layout->u.chunk.idx_type);
+    HDassert(H5D_CHUNK_IDX_EARRAY == idx_info->layout->u.chunk.idx_type);
     HDassert(H5F_addr_defined(idx_info->layout->u.chunk.u.earray.addr));
     HDassert(idx_info->layout->u.chunk.u.earray.ea);
 
@@ -739,7 +739,7 @@ H5D_earray_idx_open(const H5D_chk_idx_info_t *idx_info)
     HDassert(idx_info->f);
     HDassert(idx_info->pline);
     HDassert(idx_info->layout);
-    HDassert(H5D_CHUNK_EARRAY == idx_info->layout->u.chunk.idx_type);
+    HDassert(H5D_CHUNK_IDX_EARRAY == idx_info->layout->u.chunk.idx_type);
     HDassert(H5F_addr_defined(idx_info->layout->u.chunk.u.earray.addr));
     HDassert(NULL == idx_info->layout->u.chunk.u.earray.ea);
 
diff --git a/src/H5Dint.c b/src/H5Dint.c
index dc3918c..73ef618 100644
--- a/src/H5Dint.c
+++ b/src/H5Dint.c
@@ -727,11 +727,11 @@ H5D_set_io_ops(H5D_t *dataset)
 
             /* Set the chunk operations */
             switch(dataset->shared->layout.u.chunk.idx_type) {
-                case H5D_CHUNK_BTREE:
+                case H5D_CHUNK_IDX_BTREE:
                     dataset->shared->layout.u.chunk.ops = H5D_COPS_BTREE;
                     break;
 
-                case H5D_CHUNK_EARRAY:
+                case H5D_CHUNK_IDX_EARRAY:
                     dataset->shared->layout.u.chunk.ops = H5D_COPS_EARRAY;
                     break;
 
diff --git a/src/H5Dpublic.h b/src/H5Dpublic.h
index 136911f..79f0bc4 100644
--- a/src/H5Dpublic.h
+++ b/src/H5Dpublic.h
@@ -50,8 +50,8 @@ typedef enum H5D_layout_t {
 
 /* Types of chunk index data structures */
 typedef enum H5D_chunk_index_t {
-    H5D_CHUNK_BTREE	= 0,	/* v1 B-tree index (default)		     */
-    H5D_CHUNK_EARRAY            /* Extensible array (for 1-D unlimited dim)  */
+    H5D_CHUNK_IDX_BTREE	= 0,	/* v1 B-tree index (default)		     */
+    H5D_CHUNK_IDX_EARRAY	/* Extensible array (for 1 unlimited dim)    */
 } H5D_chunk_index_t;
 
 /* Values for the space allocation time property */
@@ -135,6 +135,7 @@ H5_DLL herr_t H5Ddebug(hid_t dset_id);
 #ifndef H5_NO_DEPRECATED_SYMBOLS
 
 /* Macros */
+#define H5D_CHUNK_BTREE H5D_CHUNK_IDX_BTREE
 
 
 /* Typedefs */
diff --git a/src/H5Olayout.c b/src/H5Olayout.c
index dae37b0..9611680 100644
--- a/src/H5Olayout.c
+++ b/src/H5Olayout.c
@@ -145,7 +145,7 @@ H5O_layout_decode(H5F_t *f, hid_t UNUSED dxpl_id, H5O_t UNUSED *open_oh,
 
             /* Set the chunk operations */
             /* (Only "btree" indexing type currently supported in this version) */
-            mesg->u.chunk.idx_type = H5D_CHUNK_BTREE;
+            mesg->u.chunk.idx_type = H5D_CHUNK_IDX_BTREE;
             mesg->u.chunk.ops = H5D_COPS_BTREE;
         } /* end if */
         else {
@@ -233,7 +233,7 @@ H5O_layout_decode(H5F_t *f, hid_t UNUSED dxpl_id, H5O_t UNUSED *open_oh,
 
                     /* Set the chunk operations */
                     /* (Only "btree" indexing type supported with v3 of message format) */
-                    mesg->u.chunk.idx_type = H5D_CHUNK_BTREE;
+                    mesg->u.chunk.idx_type = H5D_CHUNK_IDX_BTREE;
                     mesg->u.chunk.ops = H5D_COPS_BTREE;
                 } /* end if */
                 else {
@@ -257,11 +257,11 @@ H5O_layout_decode(H5F_t *f, hid_t UNUSED dxpl_id, H5O_t UNUSED *open_oh,
 
                     /* Chunk index type */
                     mesg->u.chunk.idx_type = *p++;
-                    if(mesg->u.chunk.idx_type > H5D_CHUNK_EARRAY)
+                    if(mesg->u.chunk.idx_type > H5D_CHUNK_IDX_EARRAY)
                         HGOTO_ERROR(H5E_OHDR, H5E_CANTLOAD, NULL, "unknown chunk index type")
 
                     switch(mesg->u.chunk.idx_type) {
-                        case H5D_CHUNK_BTREE:
+                        case H5D_CHUNK_IDX_BTREE:
                             /* B-tree address */
                             H5F_addr_decode(f, &p, &(mesg->u.chunk.u.btree.addr));
 
@@ -269,7 +269,7 @@ H5O_layout_decode(H5F_t *f, hid_t UNUSED dxpl_id, H5O_t UNUSED *open_oh,
                             mesg->u.chunk.ops = H5D_COPS_BTREE;
                             break;
 
-                        case H5D_CHUNK_EARRAY:
+                        case H5D_CHUNK_IDX_EARRAY:
                             /* Extensible array address */
                             H5F_addr_decode(f, &p, &(mesg->u.chunk.u.earray.addr));
 
@@ -409,12 +409,12 @@ H5O_layout_encode(H5F_t *f, hbool_t UNUSED disable_shared, uint8_t *p, const voi
                 *p++ = (uint8_t)mesg->u.chunk.idx_type;
 
                 switch(mesg->u.chunk.idx_type) {
-                    case H5D_CHUNK_BTREE:
+                    case H5D_CHUNK_IDX_BTREE:
                         /* B-tree address */
                         H5F_addr_encode(f, &p, mesg->u.chunk.u.btree.addr);
                         break;
 
-                    case H5D_CHUNK_EARRAY:
+                    case H5D_CHUNK_IDX_EARRAY:
                         /* Extensible array address */
                         H5F_addr_encode(f, &p, mesg->u.chunk.u.earray.addr);
                         break;
@@ -802,14 +802,14 @@ H5O_layout_debug(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, const void *_mesg,
 
             /* Index information */
             switch(mesg->u.chunk.idx_type) {
-                case H5D_CHUNK_BTREE:
+                case H5D_CHUNK_IDX_BTREE:
                     HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
                               "Index Type:", "v1 B-tree");
                     HDfprintf(stream, "%*s%-*s %a\n", indent, "", fwidth,
                               "B-tree address:", mesg->u.chunk.u.btree.addr);
                     break;
 
-                case H5D_CHUNK_EARRAY:
+                case H5D_CHUNK_IDX_EARRAY:
                     HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
                               "Index Type:", "Extensible Array");
                     HDfprintf(stream, "%*s%-*s %a\n", indent, "", fwidth,
@@ -919,12 +919,12 @@ H5O_layout_meta_size(const H5F_t *f, const void *_mesg)
                 ret_value++;
 
                 switch(mesg->u.chunk.idx_type) {
-                    case H5D_CHUNK_BTREE:
+                    case H5D_CHUNK_IDX_BTREE:
                         /* B-tree address */
                         ret_value += H5F_SIZEOF_ADDR(f);    /* Address of data */
                         break;
 
-                    case H5D_CHUNK_EARRAY:
+                    case H5D_CHUNK_IDX_EARRAY:
                         /* Extensible Array address */
                         ret_value += H5F_SIZEOF_ADDR(f);    /* Address of data */
                         break;
@@ -997,7 +997,7 @@ H5O_layout_set_latest_version(H5O_layout_t *layout, const H5S_t *space)
             /* Check for rank == 1 (>1 unsupported currently) */
             if(1 == ndims) {
                 /* Set the chunk index type */
-                layout->u.chunk.idx_type = H5D_CHUNK_EARRAY;
+                layout->u.chunk.idx_type = H5D_CHUNK_IDX_EARRAY;
             } /* end if */
         } /* end if */
     } /* end if */
diff --git a/src/H5Pdcpl.c b/src/H5Pdcpl.c
index 853e45d..eb4b289 100644
--- a/src/H5Pdcpl.c
+++ b/src/H5Pdcpl.c
@@ -51,7 +51,7 @@
 /* Define default layout information */
 #define H5D_DEF_LAYOUT_COMPACT_INIT  {(hbool_t)FALSE, (size_t)0, NULL}
 #define H5D_DEF_LAYOUT_CONTIG_INIT   {HADDR_UNDEF, (hsize_t)0}
-#define H5D_DEF_LAYOUT_CHUNK_INIT    {H5D_CHUNK_BTREE, (unsigned)1, {1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1}, (unsigned)0, (uint32_t)0, NULL, {{HADDR_UNDEF, NULL}}}
+#define H5D_DEF_LAYOUT_CHUNK_INIT    {H5D_CHUNK_IDX_BTREE, (unsigned)1, {1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1}, (unsigned)0, (uint32_t)0, NULL, {{HADDR_UNDEF, NULL}}}
 #ifdef H5_HAVE_C99_DESIGNATED_INITIALIZER
 #define H5D_DEF_LAYOUT_COMPACT  {H5D_COMPACT, H5O_LAYOUT_VERSION_3, NULL, { .compact = H5D_DEF_LAYOUT_COMPACT_INIT }}
 #define H5D_DEF_LAYOUT_CONTIG   {H5D_CONTIGUOUS, H5O_LAYOUT_VERSION_3, NULL, { .contig = H5D_DEF_LAYOUT_CONTIG_INIT }}
diff --git a/test/dsets.c b/test/dsets.c
index b509d9a..74bb0c9 100644
--- a/test/dsets.c
+++ b/test/dsets.c
@@ -6997,11 +6997,11 @@ test_chunk_fast(hid_t fapl)
                 /* Chunk index tyepe expected depends on whether we are using the latest version of the format */
                 if(low == H5F_LIBVER_LATEST) {
                     /* Verify index type */
-                    if(idx_type != H5D_CHUNK_EARRAY) FAIL_PUTS_ERROR("should be using extensible array as index");
+                    if(idx_type != H5D_CHUNK_IDX_EARRAY) FAIL_PUTS_ERROR("should be using extensible array as index");
                 } /* end if */
                 else {
                     /* Verify index type */
-                    if(idx_type != H5D_CHUNK_BTREE) FAIL_PUTS_ERROR("should be using v1 B-tree as index");
+                    if(idx_type != H5D_CHUNK_IDX_BTREE) FAIL_PUTS_ERROR("should be using v1 B-tree as index");
                 } /* end else */
 
                 /* Fill existing elements */
@@ -7088,11 +7088,11 @@ test_chunk_fast(hid_t fapl)
                 /* Chunk index tyepe expected depends on whether we are using the latest version of the format */
                 if(low == H5F_LIBVER_LATEST) {
                     /* Verify index type */
-                    if(idx_type != H5D_CHUNK_EARRAY) FAIL_PUTS_ERROR("should be using extensible array as index");
+                    if(idx_type != H5D_CHUNK_IDX_EARRAY) FAIL_PUTS_ERROR("should be using extensible array as index");
                 } /* end if */
                 else {
                     /* Verify index type */
-                    if(idx_type != H5D_CHUNK_BTREE) FAIL_PUTS_ERROR("should be using v1 B-tree as index");
+                    if(idx_type != H5D_CHUNK_IDX_BTREE) FAIL_PUTS_ERROR("should be using v1 B-tree as index");
                 } /* end else */
 
                 /* Create scalar dataspace */
@@ -7440,11 +7440,11 @@ test_chunk_expand(hid_t fapl)
                 /* Chunk index tyepe expected depends on whether we are using the latest version of the format */
                 if(low == H5F_LIBVER_LATEST) {
                     /* Verify index type */
-                    if(idx_type != H5D_CHUNK_EARRAY) FAIL_PUTS_ERROR("should be using extensible array as index");
+                    if(idx_type != H5D_CHUNK_IDX_EARRAY) FAIL_PUTS_ERROR("should be using extensible array as index");
                 } /* end if */
                 else {
                     /* Verify index type */
-                    if(idx_type != H5D_CHUNK_BTREE) FAIL_PUTS_ERROR("should be using v1 B-tree as index");
+                    if(idx_type != H5D_CHUNK_IDX_BTREE) FAIL_PUTS_ERROR("should be using v1 B-tree as index");
                 } /* end else */
 
                 /* Fill elements */
@@ -7562,11 +7562,11 @@ test_chunk_expand(hid_t fapl)
                 /* Chunk index tyepe expected depends on whether we are using the latest version of the format */
                 if(low == H5F_LIBVER_LATEST) {
                     /* Verify index type */
-                    if(idx_type != H5D_CHUNK_EARRAY) FAIL_PUTS_ERROR("should be using extensible array as index");
+                    if(idx_type != H5D_CHUNK_IDX_EARRAY) FAIL_PUTS_ERROR("should be using extensible array as index");
                 } /* end if */
                 else {
                     /* Verify index type */
-                    if(idx_type != H5D_CHUNK_BTREE) FAIL_PUTS_ERROR("should be using v1 B-tree as index");
+                    if(idx_type != H5D_CHUNK_IDX_BTREE) FAIL_PUTS_ERROR("should be using v1 B-tree as index");
                 } /* end else */
 
                 /* Create scalar dataspace */