summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2003-10-20 19:01:35 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2003-10-20 19:01:35 (GMT)
commit1b3954383f9a5590f12779178605216532bb515c (patch)
tree2bd7ca93c0b0e39d5a3d586f8c7bc7b28e0b8727 /src
parent4257a5e1f8cb99b7c85624dde05ba9c296384f1e (diff)
downloadhdf5-1b3954383f9a5590f12779178605216532bb515c.zip
hdf5-1b3954383f9a5590f12779178605216532bb515c.tar.gz
hdf5-1b3954383f9a5590f12779178605216532bb515c.tar.bz2
[svn-r7675] 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 :-)
Diffstat (limited to 'src')
-rw-r--r--src/H5T.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/H5T.c b/src/H5T.c
index 937fae2..fdffe13 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(""); \
}
@@ -761,7 +761,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