summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2003-10-20 19:01:41 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2003-10-20 19:01:41 (GMT)
commit0502d501c23f558a4bfa482449e898bcb1e585f9 (patch)
tree78eeb1650c193989a27cdeb12fe36721b0a3b6d0
parentd8c33ee5d42f1fdeb8722583d1812edbafa9179d (diff)
downloadhdf5-0502d501c23f558a4bfa482449e898bcb1e585f9.zip
hdf5-0502d501c23f558a4bfa482449e898bcb1e585f9.tar.gz
hdf5-0502d501c23f558a4bfa482449e898bcb1e585f9.tar.bz2
[svn-r7676] Purpose:
Bug fix Description: Avoid "OPAQUE" symbol in template macro invocation, since it's already defined as a macro on Windows. Solution: OPAQUE -> OPAQ Platforms tested: FreeBSD 4.9 (sleipnir) Windows ? (Pedro's machine :-)
-rw-r--r--src/H5T.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/H5T.c b/src/H5T.c
index e853584..f3900f2b 100644
--- a/src/H5T.c
+++ b/src/H5T.c
@@ -359,7 +359,7 @@ static herr_t H5T_register(H5T_pers_t pers, const char *name, H5T_t *src,
}
/* Define the code templates for opaque for the "GUTS" in the H5T_INIT_TYPE macro */
-#define H5T_INIT_TYPE_OPAQUE_CORE { \
+#define H5T_INIT_TYPE_OPAQ_CORE { \
H5T_INIT_TYPE_ALLOC_COMMON(H5T_OPAQUE) \
dt->u.opaque.tag = H5MM_strdup(""); \
}
@@ -757,7 +757,7 @@ H5T_init_interface(void)
copied_dtype=0;
/* Opaque data */
- H5T_INIT_TYPE(OPAQUE,H5T_NATIVE_OPAQUE_g,ALLOC,-,SET,1)
+ H5T_INIT_TYPE(OPAQ,H5T_NATIVE_OPAQUE_g,ALLOC,-,SET,1)
/*------------------------------------------------------------
* The `C' architecture