[svn-r5931]

Purpose:
__DLL__ is a keyword in some platforms and __DLL__ is also defined as a macro for windows DLL applications.
That causes problems.
Description:
Solution:
Use H5_DLL*** to replace __DLL***__ at all header files.
Change the macro defination at H5api_adpt.h.
Platforms tested:
linux2.2.18smp, irix64, solaris 2.7 and windows 2000

1 files changed, 143 insertions, 143 deletions

diff --git a/src/H5Tpublic.h b/src/H5Tpublic.h
index b6f9c58..1d66054 100644
--- a/src/H5Tpublic.h
+++ b/src/H5Tpublic.h
@@ -196,10 +196,10 @@ extern "C" {
 #define H5T_IEEE_F32LE		(H5open(), H5T_IEEE_F32LE_g)
 #define H5T_IEEE_F64BE		(H5open(), H5T_IEEE_F64BE_g)
 #define H5T_IEEE_F64LE		(H5open(), H5T_IEEE_F64LE_g)
-__DLLVAR__ hid_t H5T_IEEE_F32BE_g;
-__DLLVAR__ hid_t H5T_IEEE_F32LE_g;
-__DLLVAR__ hid_t H5T_IEEE_F64BE_g;
-__DLLVAR__ hid_t H5T_IEEE_F64LE_g;
+H5_DLLVAR hid_t H5T_IEEE_F32BE_g;
+H5_DLLVAR hid_t H5T_IEEE_F32LE_g;
+H5_DLLVAR hid_t H5T_IEEE_F64BE_g;
+H5_DLLVAR hid_t H5T_IEEE_F64LE_g;
 
 /*
  * These are "standard" types.  For instance, signed (2's complement) and
@@ -231,32 +231,32 @@ __DLLVAR__ hid_t H5T_IEEE_F64LE_g;
 #define H5T_STD_B64LE		(H5open(), H5T_STD_B64LE_g)
 #define H5T_STD_REF_OBJ	    (H5open(), H5T_STD_REF_OBJ_g)
 #define H5T_STD_REF_DSETREG (H5open(), H5T_STD_REF_DSETREG_g)
-__DLLVAR__ hid_t H5T_STD_I8BE_g;
-__DLLVAR__ hid_t H5T_STD_I8LE_g;
-__DLLVAR__ hid_t H5T_STD_I16BE_g;
-__DLLVAR__ hid_t H5T_STD_I16LE_g;
-__DLLVAR__ hid_t H5T_STD_I32BE_g;
-__DLLVAR__ hid_t H5T_STD_I32LE_g;
-__DLLVAR__ hid_t H5T_STD_I64BE_g;
-__DLLVAR__ hid_t H5T_STD_I64LE_g;
-__DLLVAR__ hid_t H5T_STD_U8BE_g;
-__DLLVAR__ hid_t H5T_STD_U8LE_g;
-__DLLVAR__ hid_t H5T_STD_U16BE_g;
-__DLLVAR__ hid_t H5T_STD_U16LE_g;
-__DLLVAR__ hid_t H5T_STD_U32BE_g;
-__DLLVAR__ hid_t H5T_STD_U32LE_g;
-__DLLVAR__ hid_t H5T_STD_U64BE_g;
-__DLLVAR__ hid_t H5T_STD_U64LE_g;
-__DLLVAR__ hid_t H5T_STD_B8BE_g;
-__DLLVAR__ hid_t H5T_STD_B8LE_g;
-__DLLVAR__ hid_t H5T_STD_B16BE_g;
-__DLLVAR__ hid_t H5T_STD_B16LE_g;
-__DLLVAR__ hid_t H5T_STD_B32BE_g;
-__DLLVAR__ hid_t H5T_STD_B32LE_g;
-__DLLVAR__ hid_t H5T_STD_B64BE_g;
-__DLLVAR__ hid_t H5T_STD_B64LE_g;
-__DLLVAR__ hid_t H5T_STD_REF_OBJ_g;
-__DLLVAR__ hid_t H5T_STD_REF_DSETREG_g;
+H5_DLLVAR hid_t H5T_STD_I8BE_g;
+H5_DLLVAR hid_t H5T_STD_I8LE_g;
+H5_DLLVAR hid_t H5T_STD_I16BE_g;
+H5_DLLVAR hid_t H5T_STD_I16LE_g;
+H5_DLLVAR hid_t H5T_STD_I32BE_g;
+H5_DLLVAR hid_t H5T_STD_I32LE_g;
+H5_DLLVAR hid_t H5T_STD_I64BE_g;
+H5_DLLVAR hid_t H5T_STD_I64LE_g;
+H5_DLLVAR hid_t H5T_STD_U8BE_g;
+H5_DLLVAR hid_t H5T_STD_U8LE_g;
+H5_DLLVAR hid_t H5T_STD_U16BE_g;
+H5_DLLVAR hid_t H5T_STD_U16LE_g;
+H5_DLLVAR hid_t H5T_STD_U32BE_g;
+H5_DLLVAR hid_t H5T_STD_U32LE_g;
+H5_DLLVAR hid_t H5T_STD_U64BE_g;
+H5_DLLVAR hid_t H5T_STD_U64LE_g;
+H5_DLLVAR hid_t H5T_STD_B8BE_g;
+H5_DLLVAR hid_t H5T_STD_B8LE_g;
+H5_DLLVAR hid_t H5T_STD_B16BE_g;
+H5_DLLVAR hid_t H5T_STD_B16LE_g;
+H5_DLLVAR hid_t H5T_STD_B32BE_g;
+H5_DLLVAR hid_t H5T_STD_B32LE_g;
+H5_DLLVAR hid_t H5T_STD_B64BE_g;
+H5_DLLVAR hid_t H5T_STD_B64LE_g;
+H5_DLLVAR hid_t H5T_STD_REF_OBJ_g;
+H5_DLLVAR hid_t H5T_STD_REF_DSETREG_g;
 
 /*
  * Types which are particular to Unix.
@@ -265,23 +265,23 @@ __DLLVAR__ hid_t H5T_STD_REF_DSETREG_g;
 #define H5T_UNIX_D32LE		(H5open(), H5T_UNIX_D32LE_g)
 #define H5T_UNIX_D64BE		(H5open(), H5T_UNIX_D64BE_g)
 #define H5T_UNIX_D64LE		(H5open(), H5T_UNIX_D64LE_g)
-__DLLVAR__ hid_t H5T_UNIX_D32BE_g;
-__DLLVAR__ hid_t H5T_UNIX_D32LE_g;
-__DLLVAR__ hid_t H5T_UNIX_D64BE_g;
-__DLLVAR__ hid_t H5T_UNIX_D64LE_g;
+H5_DLLVAR hid_t H5T_UNIX_D32BE_g;
+H5_DLLVAR hid_t H5T_UNIX_D32LE_g;
+H5_DLLVAR hid_t H5T_UNIX_D64BE_g;
+H5_DLLVAR hid_t H5T_UNIX_D64LE_g;
 
 /*
  * Types particular to the C language.  String types use `bytes' instead
  * of `bits' as their size.
  */
 #define H5T_C_S1		(H5open(), H5T_C_S1_g)
-__DLLVAR__ hid_t H5T_C_S1_g;
+H5_DLLVAR hid_t H5T_C_S1_g;
 
 /*
  * Types particular to Fortran.
  */
 #define H5T_FORTRAN_S1		(H5open(), H5T_FORTRAN_S1_g)
-__DLLVAR__ hid_t H5T_FORTRAN_S1_g;
+H5_DLLVAR hid_t H5T_FORTRAN_S1_g;
 
 /*
  * These types are for Intel CPU's.  They are little endian with IEEE
@@ -373,29 +373,29 @@ __DLLVAR__ hid_t H5T_FORTRAN_S1_g;
 #define H5T_NATIVE_HSSIZE	(H5open(), H5T_NATIVE_HSSIZE_g)
 #define H5T_NATIVE_HERR		(H5open(), H5T_NATIVE_HERR_g)
 #define H5T_NATIVE_HBOOL	(H5open(), H5T_NATIVE_HBOOL_g)
-__DLLVAR__ hid_t H5T_NATIVE_SCHAR_g;
-__DLLVAR__ hid_t H5T_NATIVE_UCHAR_g;
-__DLLVAR__ hid_t H5T_NATIVE_SHORT_g;
-__DLLVAR__ hid_t H5T_NATIVE_USHORT_g;
-__DLLVAR__ hid_t H5T_NATIVE_INT_g;
-__DLLVAR__ hid_t H5T_NATIVE_UINT_g;
-__DLLVAR__ hid_t H5T_NATIVE_LONG_g;
-__DLLVAR__ hid_t H5T_NATIVE_ULONG_g;
-__DLLVAR__ hid_t H5T_NATIVE_LLONG_g;
-__DLLVAR__ hid_t H5T_NATIVE_ULLONG_g;
-__DLLVAR__ hid_t H5T_NATIVE_FLOAT_g;
-__DLLVAR__ hid_t H5T_NATIVE_DOUBLE_g;
-__DLLVAR__ hid_t H5T_NATIVE_LDOUBLE_g;
-__DLLVAR__ hid_t H5T_NATIVE_B8_g;
-__DLLVAR__ hid_t H5T_NATIVE_B16_g;
-__DLLVAR__ hid_t H5T_NATIVE_B32_g;
-__DLLVAR__ hid_t H5T_NATIVE_B64_g;
-__DLLVAR__ hid_t H5T_NATIVE_OPAQUE_g;
-__DLLVAR__ hid_t H5T_NATIVE_HADDR_g;
-__DLLVAR__ hid_t H5T_NATIVE_HSIZE_g;
-__DLLVAR__ hid_t H5T_NATIVE_HSSIZE_g;
-__DLLVAR__ hid_t H5T_NATIVE_HERR_g;
-__DLLVAR__ hid_t H5T_NATIVE_HBOOL_g;
+H5_DLLVAR hid_t H5T_NATIVE_SCHAR_g;
+H5_DLLVAR hid_t H5T_NATIVE_UCHAR_g;
+H5_DLLVAR hid_t H5T_NATIVE_SHORT_g;
+H5_DLLVAR hid_t H5T_NATIVE_USHORT_g;
+H5_DLLVAR hid_t H5T_NATIVE_INT_g;
+H5_DLLVAR hid_t H5T_NATIVE_UINT_g;
+H5_DLLVAR hid_t H5T_NATIVE_LONG_g;
+H5_DLLVAR hid_t H5T_NATIVE_ULONG_g;
+H5_DLLVAR hid_t H5T_NATIVE_LLONG_g;
+H5_DLLVAR hid_t H5T_NATIVE_ULLONG_g;
+H5_DLLVAR hid_t H5T_NATIVE_FLOAT_g;
+H5_DLLVAR hid_t H5T_NATIVE_DOUBLE_g;
+H5_DLLVAR hid_t H5T_NATIVE_LDOUBLE_g;
+H5_DLLVAR hid_t H5T_NATIVE_B8_g;
+H5_DLLVAR hid_t H5T_NATIVE_B16_g;
+H5_DLLVAR hid_t H5T_NATIVE_B32_g;
+H5_DLLVAR hid_t H5T_NATIVE_B64_g;
+H5_DLLVAR hid_t H5T_NATIVE_OPAQUE_g;
+H5_DLLVAR hid_t H5T_NATIVE_HADDR_g;
+H5_DLLVAR hid_t H5T_NATIVE_HSIZE_g;
+H5_DLLVAR hid_t H5T_NATIVE_HSSIZE_g;
+H5_DLLVAR hid_t H5T_NATIVE_HERR_g;
+H5_DLLVAR hid_t H5T_NATIVE_HBOOL_g;
 
 /* C9x integer types */
 #define H5T_NATIVE_INT8			(H5open(), H5T_NATIVE_INT8_g)
@@ -404,12 +404,12 @@ __DLLVAR__ hid_t H5T_NATIVE_HBOOL_g;
 #define H5T_NATIVE_UINT_LEAST8		(H5open(), H5T_NATIVE_UINT_LEAST8_g)
 #define H5T_NATIVE_INT_FAST8 		(H5open(), H5T_NATIVE_INT_FAST8_g)
 #define H5T_NATIVE_UINT_FAST8		(H5open(), H5T_NATIVE_UINT_FAST8_g)
-__DLLVAR__ hid_t H5T_NATIVE_INT8_g;
-__DLLVAR__ hid_t H5T_NATIVE_UINT8_g;
-__DLLVAR__ hid_t H5T_NATIVE_INT_LEAST8_g;
-__DLLVAR__ hid_t H5T_NATIVE_UINT_LEAST8_g;
-__DLLVAR__ hid_t H5T_NATIVE_INT_FAST8_g;
-__DLLVAR__ hid_t H5T_NATIVE_UINT_FAST8_g;
+H5_DLLVAR hid_t H5T_NATIVE_INT8_g;
+H5_DLLVAR hid_t H5T_NATIVE_UINT8_g;
+H5_DLLVAR hid_t H5T_NATIVE_INT_LEAST8_g;
+H5_DLLVAR hid_t H5T_NATIVE_UINT_LEAST8_g;
+H5_DLLVAR hid_t H5T_NATIVE_INT_FAST8_g;
+H5_DLLVAR hid_t H5T_NATIVE_UINT_FAST8_g;
 
 #define H5T_NATIVE_INT16		(H5open(), H5T_NATIVE_INT16_g)
 #define H5T_NATIVE_UINT16		(H5open(), H5T_NATIVE_UINT16_g)
@@ -417,12 +417,12 @@ __DLLVAR__ hid_t H5T_NATIVE_UINT_FAST8_g;
 #define H5T_NATIVE_UINT_LEAST16		(H5open(), H5T_NATIVE_UINT_LEAST16_g)
 #define H5T_NATIVE_INT_FAST16		(H5open(), H5T_NATIVE_INT_FAST16_g)
 #define H5T_NATIVE_UINT_FAST16		(H5open(), H5T_NATIVE_UINT_FAST16_g)
-__DLLVAR__ hid_t H5T_NATIVE_INT16_g;
-__DLLVAR__ hid_t H5T_NATIVE_UINT16_g;
-__DLLVAR__ hid_t H5T_NATIVE_INT_LEAST16_g;
-__DLLVAR__ hid_t H5T_NATIVE_UINT_LEAST16_g;
-__DLLVAR__ hid_t H5T_NATIVE_INT_FAST16_g;
-__DLLVAR__ hid_t H5T_NATIVE_UINT_FAST16_g;
+H5_DLLVAR hid_t H5T_NATIVE_INT16_g;
+H5_DLLVAR hid_t H5T_NATIVE_UINT16_g;
+H5_DLLVAR hid_t H5T_NATIVE_INT_LEAST16_g;
+H5_DLLVAR hid_t H5T_NATIVE_UINT_LEAST16_g;
+H5_DLLVAR hid_t H5T_NATIVE_INT_FAST16_g;
+H5_DLLVAR hid_t H5T_NATIVE_UINT_FAST16_g;
 
 #define H5T_NATIVE_INT32		(H5open(), H5T_NATIVE_INT32_g)
 #define H5T_NATIVE_UINT32		(H5open(), H5T_NATIVE_UINT32_g)
@@ -430,12 +430,12 @@ __DLLVAR__ hid_t H5T_NATIVE_UINT_FAST16_g;
 #define H5T_NATIVE_UINT_LEAST32		(H5open(), H5T_NATIVE_UINT_LEAST32_g)
 #define H5T_NATIVE_INT_FAST32		(H5open(), H5T_NATIVE_INT_FAST32_g)
 #define H5T_NATIVE_UINT_FAST32		(H5open(), H5T_NATIVE_UINT_FAST32_g)
-__DLLVAR__ hid_t H5T_NATIVE_INT32_g;
-__DLLVAR__ hid_t H5T_NATIVE_UINT32_g;
-__DLLVAR__ hid_t H5T_NATIVE_INT_LEAST32_g;
-__DLLVAR__ hid_t H5T_NATIVE_UINT_LEAST32_g;
-__DLLVAR__ hid_t H5T_NATIVE_INT_FAST32_g;
-__DLLVAR__ hid_t H5T_NATIVE_UINT_FAST32_g;
+H5_DLLVAR hid_t H5T_NATIVE_INT32_g;
+H5_DLLVAR hid_t H5T_NATIVE_UINT32_g;
+H5_DLLVAR hid_t H5T_NATIVE_INT_LEAST32_g;
+H5_DLLVAR hid_t H5T_NATIVE_UINT_LEAST32_g;
+H5_DLLVAR hid_t H5T_NATIVE_INT_FAST32_g;
+H5_DLLVAR hid_t H5T_NATIVE_UINT_FAST32_g;
 
 #define H5T_NATIVE_INT64		(H5open(), H5T_NATIVE_INT64_g)
 #define H5T_NATIVE_UINT64		(H5open(), H5T_NATIVE_UINT64_g)
@@ -443,102 +443,102 @@ __DLLVAR__ hid_t H5T_NATIVE_UINT_FAST32_g;
 #define H5T_NATIVE_UINT_LEAST64 	(H5open(), H5T_NATIVE_UINT_LEAST64_g)
 #define H5T_NATIVE_INT_FAST64		(H5open(), H5T_NATIVE_INT_FAST64_g)
 #define H5T_NATIVE_UINT_FAST64		(H5open(), H5T_NATIVE_UINT_FAST64_g)
-__DLLVAR__ hid_t H5T_NATIVE_INT64_g;
-__DLLVAR__ hid_t H5T_NATIVE_UINT64_g;
-__DLLVAR__ hid_t H5T_NATIVE_INT_LEAST64_g;
-__DLLVAR__ hid_t H5T_NATIVE_UINT_LEAST64_g;
-__DLLVAR__ hid_t H5T_NATIVE_INT_FAST64_g;
-__DLLVAR__ hid_t H5T_NATIVE_UINT_FAST64_g;
+H5_DLLVAR hid_t H5T_NATIVE_INT64_g;
+H5_DLLVAR hid_t H5T_NATIVE_UINT64_g;
+H5_DLLVAR hid_t H5T_NATIVE_INT_LEAST64_g;
+H5_DLLVAR hid_t H5T_NATIVE_UINT_LEAST64_g;
+H5_DLLVAR hid_t H5T_NATIVE_INT_FAST64_g;
+H5_DLLVAR hid_t H5T_NATIVE_UINT_FAST64_g;
 
 /* Operations defined on all data types */
-__DLL__ hid_t H5Topen(hid_t loc_id, const char *name);
-__DLL__ hid_t H5Tcreate(H5T_class_t type, size_t size);
-__DLL__ hid_t H5Tcopy(hid_t type_id);
-__DLL__ herr_t H5Tclose(hid_t type_id);
-__DLL__ htri_t H5Tequal(hid_t type1_id, hid_t type2_id);
-__DLL__ herr_t H5Tlock(hid_t type_id);
-__DLL__ herr_t H5Tcommit(hid_t loc_id, const char *name, hid_t type_id);
-__DLL__ htri_t H5Tcommitted(hid_t type_id);
+H5_DLL hid_t H5Topen(hid_t loc_id, const char *name);
+H5_DLL hid_t H5Tcreate(H5T_class_t type, size_t size);
+H5_DLL hid_t H5Tcopy(hid_t type_id);
+H5_DLL herr_t H5Tclose(hid_t type_id);
+H5_DLL htri_t H5Tequal(hid_t type1_id, hid_t type2_id);
+H5_DLL herr_t H5Tlock(hid_t type_id);
+H5_DLL herr_t H5Tcommit(hid_t loc_id, const char *name, hid_t type_id);
+H5_DLL htri_t H5Tcommitted(hid_t type_id);
 
 /* Operations defined on compound data types */
-__DLL__ herr_t H5Tinsert(hid_t parent_id, const char *name, size_t offset,
+H5_DLL herr_t H5Tinsert(hid_t parent_id, const char *name, size_t offset,
 			 hid_t member_id);
-__DLL__ herr_t H5Tpack(hid_t type_id);
+H5_DLL herr_t H5Tpack(hid_t type_id);
 
 /* Operations defined on enumeration data types */
-__DLL__ hid_t H5Tenum_create(hid_t base_id);
-__DLL__ herr_t H5Tenum_insert(hid_t type, const char *name, void *value);
-__DLL__ herr_t H5Tenum_nameof(hid_t type, void *value, char *name/*out*/,
+H5_DLL hid_t H5Tenum_create(hid_t base_id);
+H5_DLL herr_t H5Tenum_insert(hid_t type, const char *name, void *value);
+H5_DLL herr_t H5Tenum_nameof(hid_t type, void *value, char *name/*out*/,
 			     size_t size);
-__DLL__ herr_t H5Tenum_valueof(hid_t type, const char *name,
+H5_DLL herr_t H5Tenum_valueof(hid_t type, const char *name,
 			      void *value/*out*/);
 
 /* Operations defined on variable-length data types */
-__DLL__ hid_t H5Tvlen_create(hid_t base_id);
+H5_DLL hid_t H5Tvlen_create(hid_t base_id);
 
 /* Operations defined on array data types */
-__DLL__ hid_t H5Tarray_create(hid_t base_id, int ndims,
+H5_DLL hid_t H5Tarray_create(hid_t base_id, int ndims,
             const hsize_t dim[/* ndims */], const int perm[/* ndims */]);
-__DLL__ int H5Tget_array_ndims(hid_t type_id);
-__DLL__ herr_t H5Tget_array_dims(hid_t type_id, hsize_t dims[], int perm[]);
+H5_DLL int H5Tget_array_ndims(hid_t type_id);
+H5_DLL herr_t H5Tget_array_dims(hid_t type_id, hsize_t dims[], int perm[]);
 
 /* Operations defined on opaque data types */
-__DLL__ herr_t H5Tset_tag(hid_t type, const char *tag);
-__DLL__ char *H5Tget_tag(hid_t type);
+H5_DLL herr_t H5Tset_tag(hid_t type, const char *tag);
+H5_DLL char *H5Tget_tag(hid_t type);
 
 /* Querying property values */
-__DLL__ hid_t H5Tget_super(hid_t type);
-__DLL__ H5T_class_t H5Tget_class(hid_t type_id);
-__DLL__ htri_t H5Tdetect_class(hid_t type_id, H5T_class_t cls);
-__DLL__ size_t H5Tget_size(hid_t type_id);
-__DLL__ H5T_order_t H5Tget_order(hid_t type_id);
-__DLL__ size_t H5Tget_precision(hid_t type_id);
-__DLL__ int H5Tget_offset(hid_t type_id);
-__DLL__ herr_t H5Tget_pad(hid_t type_id, H5T_pad_t *lsb/*out*/,
+H5_DLL hid_t H5Tget_super(hid_t type);
+H5_DLL H5T_class_t H5Tget_class(hid_t type_id);
+H5_DLL htri_t H5Tdetect_class(hid_t type_id, H5T_class_t cls);
+H5_DLL size_t H5Tget_size(hid_t type_id);
+H5_DLL H5T_order_t H5Tget_order(hid_t type_id);
+H5_DLL size_t H5Tget_precision(hid_t type_id);
+H5_DLL int H5Tget_offset(hid_t type_id);
+H5_DLL herr_t H5Tget_pad(hid_t type_id, H5T_pad_t *lsb/*out*/,
 			  H5T_pad_t *msb/*out*/);
-__DLL__ H5T_sign_t H5Tget_sign(hid_t type_id);
-__DLL__ herr_t H5Tget_fields(hid_t type_id, size_t *spos/*out*/,
+H5_DLL H5T_sign_t H5Tget_sign(hid_t type_id);
+H5_DLL herr_t H5Tget_fields(hid_t type_id, size_t *spos/*out*/,
 			     size_t *epos/*out*/, size_t *esize/*out*/,
 			     size_t *mpos/*out*/, size_t *msize/*out*/);
-__DLL__ size_t H5Tget_ebias(hid_t type_id);
-__DLL__ H5T_norm_t H5Tget_norm(hid_t type_id);
-__DLL__ H5T_pad_t H5Tget_inpad(hid_t type_id);
-__DLL__ H5T_str_t H5Tget_strpad(hid_t type_id);
-__DLL__ int H5Tget_nmembers(hid_t type_id);
-__DLL__ char *H5Tget_member_name(hid_t type_id, int membno);
-__DLL__ int H5Tget_member_index(hid_t type_id, const char *name);
-__DLL__ size_t H5Tget_member_offset(hid_t type_id, int membno);
-__DLL__ H5T_class_t H5Tget_member_class(hid_t type_id, int membno);
-__DLL__ hid_t H5Tget_member_type(hid_t type_id, int membno);
-__DLL__ herr_t H5Tget_member_value(hid_t type_id, int membno,
+H5_DLL size_t H5Tget_ebias(hid_t type_id);
+H5_DLL H5T_norm_t H5Tget_norm(hid_t type_id);
+H5_DLL H5T_pad_t H5Tget_inpad(hid_t type_id);
+H5_DLL H5T_str_t H5Tget_strpad(hid_t type_id);
+H5_DLL int H5Tget_nmembers(hid_t type_id);
+H5_DLL char *H5Tget_member_name(hid_t type_id, int membno);
+H5_DLL int H5Tget_member_index(hid_t type_id, const char *name);
+H5_DLL size_t H5Tget_member_offset(hid_t type_id, int membno);
+H5_DLL H5T_class_t H5Tget_member_class(hid_t type_id, int membno);
+H5_DLL hid_t H5Tget_member_type(hid_t type_id, int membno);
+H5_DLL herr_t H5Tget_member_value(hid_t type_id, int membno,
 				   void *value/*out*/);
-__DLL__ H5T_cset_t H5Tget_cset(hid_t type_id);
+H5_DLL H5T_cset_t H5Tget_cset(hid_t type_id);
 
 /* Setting property values */
-__DLL__ herr_t H5Tset_size(hid_t type_id, size_t size);
-__DLL__ herr_t H5Tset_order(hid_t type_id, H5T_order_t order);
-__DLL__ herr_t H5Tset_precision(hid_t type_id, size_t prec);
-__DLL__ herr_t H5Tset_offset(hid_t type_id, size_t offset);
-__DLL__ herr_t H5Tset_pad(hid_t type_id, H5T_pad_t lsb, H5T_pad_t msb);
-__DLL__ herr_t H5Tset_sign(hid_t type_id, H5T_sign_t sign);
-__DLL__ herr_t H5Tset_fields(hid_t type_id, size_t spos, size_t epos,
+H5_DLL herr_t H5Tset_size(hid_t type_id, size_t size);
+H5_DLL herr_t H5Tset_order(hid_t type_id, H5T_order_t order);
+H5_DLL herr_t H5Tset_precision(hid_t type_id, size_t prec);
+H5_DLL herr_t H5Tset_offset(hid_t type_id, size_t offset);
+H5_DLL herr_t H5Tset_pad(hid_t type_id, H5T_pad_t lsb, H5T_pad_t msb);
+H5_DLL herr_t H5Tset_sign(hid_t type_id, H5T_sign_t sign);
+H5_DLL herr_t H5Tset_fields(hid_t type_id, size_t spos, size_t epos,
 			     size_t esize, size_t mpos, size_t msize);
-__DLL__ herr_t H5Tset_ebias(hid_t type_id, size_t ebias);
-__DLL__ herr_t H5Tset_norm(hid_t type_id, H5T_norm_t norm);
-__DLL__ herr_t H5Tset_inpad(hid_t type_id, H5T_pad_t pad);
-__DLL__ herr_t H5Tset_cset(hid_t type_id, H5T_cset_t cset);
-__DLL__ herr_t H5Tset_strpad(hid_t type_id, H5T_str_t strpad);
+H5_DLL herr_t H5Tset_ebias(hid_t type_id, size_t ebias);
+H5_DLL herr_t H5Tset_norm(hid_t type_id, H5T_norm_t norm);
+H5_DLL herr_t H5Tset_inpad(hid_t type_id, H5T_pad_t pad);
+H5_DLL herr_t H5Tset_cset(hid_t type_id, H5T_cset_t cset);
+H5_DLL herr_t H5Tset_strpad(hid_t type_id, H5T_str_t strpad);
 
 /* Type conversion database */
-__DLL__ herr_t H5Tregister(H5T_pers_t pers, const char *name, hid_t src_id,
+H5_DLL herr_t H5Tregister(H5T_pers_t pers, const char *name, hid_t src_id,
 			   hid_t dst_id, H5T_conv_t func);
-__DLL__ herr_t H5Tunregister(H5T_pers_t pers, const char *name, hid_t src_id,
+H5_DLL herr_t H5Tunregister(H5T_pers_t pers, const char *name, hid_t src_id,
 			     hid_t dst_id, H5T_conv_t func);
-__DLL__ H5T_conv_t H5Tfind(hid_t src_id, hid_t dst_id, H5T_cdata_t **pcdata);
-__DLL__ herr_t H5Tconvert(hid_t src_id, hid_t dst_id, hsize_t nelmts,
+H5_DLL H5T_conv_t H5Tfind(hid_t src_id, hid_t dst_id, H5T_cdata_t **pcdata);
+H5_DLL herr_t H5Tconvert(hid_t src_id, hid_t dst_id, hsize_t nelmts,
 			  void *buf, void *background, hid_t plist_id);
-__DLL__ H5T_overflow_t H5Tget_overflow(void);
-__DLL__ herr_t H5Tset_overflow(H5T_overflow_t func);
+H5_DLL H5T_overflow_t H5Tget_overflow(void);
+H5_DLL herr_t H5Tset_overflow(H5T_overflow_t func);
 
 #ifdef __cplusplus
 }