summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2009-08-04 22:55:02 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2009-08-04 22:55:02 (GMT)
commit61c693615a1f4f90f7654f639170eed2f3c85262 (patch)
tree437c2ce43469eaf13f54d5928caeaf6a05448454
parent5debc601820d1151bd0a45a8176aa412536a896e (diff)
downloadhdf5-61c693615a1f4f90f7654f639170eed2f3c85262.zip
hdf5-61c693615a1f4f90f7654f639170eed2f3c85262.tar.gz
hdf5-61c693615a1f4f90f7654f639170eed2f3c85262.tar.bz2
[svn-r17302] Description:
Correct errors on machines (like Windows) that don't have C99 named initializer support. Tested on: Mac OS X/32 10.5.7 (duty) Windows build (by Allen)
-rw-r--r--src/H5Pdcpl.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/H5Pdcpl.c b/src/H5Pdcpl.c
index 8314c72..9f8650c 100644
--- a/src/H5Pdcpl.c
+++ b/src/H5Pdcpl.c
@@ -65,9 +65,9 @@
* layout is first in the union. These values are overridden in the
* H5P_init_def_layout() routine. -QAK
*/
-#define H5D_DEF_LAYOUT_COMPACT {H5D_COMPACT, H5O_LAYOUT_VERSION_3, NULL, {H5D_DEF_LAYOUT_CHUNK_INIT}, {H5D_CONTIGUOUS, H5D_DEF_STORAGE_CONTIG}}
-#define H5D_DEF_LAYOUT_CONTIG {H5D_CONTIGUOUS, H5O_LAYOUT_VERSION_3, NULL, {H5D_DEF_LAYOUT_CHUNK_INIT}, {H5D_CONTIGUOUS, H5D_DEF_STORAGE_CONTIG}}
-#define H5D_DEF_LAYOUT_CHUNK {H5D_CHUNKED, H5O_LAYOUT_VERSION_3, NULL, {H5D_DEF_LAYOUT_CHUNK_INIT}, {H5D_CONTIGUOUS, H5D_DEF_STORAGE_CONTIG}}
+#define H5D_DEF_LAYOUT_COMPACT {H5D_COMPACT, H5O_LAYOUT_VERSION_3, NULL, {H5D_DEF_LAYOUT_CHUNK_INIT}, {H5D_CONTIGUOUS, H5D_DEF_STORAGE_CONTIG_INIT}}
+#define H5D_DEF_LAYOUT_CONTIG {H5D_CONTIGUOUS, H5O_LAYOUT_VERSION_3, NULL, {H5D_DEF_LAYOUT_CHUNK_INIT}, {H5D_CONTIGUOUS, H5D_DEF_STORAGE_CONTIG_INIT}}
+#define H5D_DEF_LAYOUT_CHUNK {H5D_CHUNKED, H5O_LAYOUT_VERSION_3, NULL, {H5D_DEF_LAYOUT_CHUNK_INIT}, {H5D_CONTIGUOUS, H5D_DEF_STORAGE_CONTIG_INIT}}
#endif /* H5_HAVE_C99_DESIGNATED_INITIALIZER */
/* ======== Dataset creation properties ======== */
@@ -766,7 +766,6 @@ done:
static herr_t
H5P_init_def_layout(void)
{
- const H5O_layout_compact_t def_layout_compact = H5D_DEF_LAYOUT_COMPACT_INIT;
const H5O_layout_chunk_t def_layout_chunk = H5D_DEF_LAYOUT_CHUNK_INIT;
const H5O_storage_compact_t def_store_compact = H5D_DEF_STORAGE_COMPACT_INIT;
const H5O_storage_chunk_t def_store_chunk = H5D_DEF_STORAGE_CHUNK_INIT;
@@ -774,9 +773,8 @@ H5P_init_def_layout(void)
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5P_init_def_layout)
/* Initialize the default layout info for non-contigous layouts */
- H5D_def_layout_compact_g.u.compact = def_layout_compact;
H5D_def_layout_compact_g.storage.u.compact = def_store_compact;
- H5D_def_layout_chunk_g.u.chunk = def_chunk;
+ H5D_def_layout_chunk_g.u.chunk = def_layout_chunk;
H5D_def_layout_chunk_g.storage.u.chunk = def_store_chunk;
/* Note that we've initialized the default values */