[svn-r14057] Purpose: Fixes for 64-bit Windows Intel Fortran 9.1

Description:

We are porting Fortran to 64-bit Windows, and need to make many syntactical changes to bring the code up to date.  We now go back to using "!DEC$" rather than "!MS$" in our "ATTRIBUTE" code.  Also, the naming conventions for mixed language is inconsistent from 32- to 64- bit Windows.  To make up with this, we use the "decorate" flag.  We also needed to change the "calling convention" in project settings from "CVF" to "default".

Also other minor cleanups on project files.

Tested:
32-bit: VS.NET and VS2005
64-bit: VS2005

1 files changed, 52 insertions, 52 deletions

diff --git a/fortran/src/H5Tff.f90 b/fortran/src/H5Tff.f90
index 2488522..ee5bb77 100644
--- a/fortran/src/H5Tff.f90
+++ b/fortran/src/H5Tff.f90
@@ -70,7 +70,7 @@
               INTEGER FUNCTION h5topen_c(loc_id, name, namelen, type_id)
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !MS$ATTRIBUTES C,reference,alias:'_H5TOPEN_C'::h5topen_c
+              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TOPEN_C'::h5topen_c
               !DEC$ ENDIF
               !DEC$ATTRIBUTES reference ::name 
               INTEGER(HID_T), INTENT(IN) :: loc_id
@@ -134,7 +134,7 @@
               INTEGER FUNCTION h5tcommit_c(loc_id, name, namelen, type_id)
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !MS$ATTRIBUTES C,reference,alias:'_H5TCOMMIT_C'::h5tcommit_c
+              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TCOMMIT_C'::h5tcommit_c
               !DEC$ ENDIF
               !DEC$ATTRIBUTES reference ::name 
               INTEGER(HID_T), INTENT(IN) :: loc_id
@@ -194,7 +194,7 @@
               INTEGER FUNCTION  h5tcopy_c(type_id, new_type_id)
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !MS$ATTRIBUTES C,reference,alias:'_H5TCOPY_C'::h5tcopy_c
+              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TCOPY_C'::h5tcopy_c
               !DEC$ ENDIF
               INTEGER(HID_T), INTENT(IN) :: type_id
               INTEGER(HID_T), INTENT(OUT) :: new_type_id
@@ -253,7 +253,7 @@
               INTEGER FUNCTION h5tequal_c(type1_id, type2_id, c_flag)
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !MS$ATTRIBUTES C,reference,alias:'_H5TEQUAL_C'::h5tequal_c
+              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TEQUAL_C'::h5tequal_c
               !DEC$ ENDIF
               INTEGER(HID_T), INTENT(IN) :: type1_id 
               INTEGER(HID_T), INTENT(IN) :: type2_id 
@@ -309,7 +309,7 @@
               INTEGER FUNCTION h5tclose_c(type_id)
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !MS$ATTRIBUTES C,reference,alias:'_H5TCLOSE_C'::h5tclose_c
+              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TCLOSE_C'::h5tclose_c
               !DEC$ ENDIF
               INTEGER(HID_T), INTENT(IN) :: type_id
               END FUNCTION h5tclose_c
@@ -384,7 +384,7 @@
               INTEGER FUNCTION h5tget_class_c(type_id, class)
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !MS$ATTRIBUTES C,reference,alias:'_H5TGET_CLASS_C'::h5tget_class_c
+              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TGET_CLASS_C'::h5tget_class_c
               !DEC$ ENDIF
               INTEGER(HID_T), INTENT(IN) :: type_id 
               INTEGER, INTENT(OUT) :: class
@@ -439,7 +439,7 @@
               INTEGER FUNCTION h5tget_size_c(type_id, size)
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !MS$ATTRIBUTES C,reference,alias:'_H5TGET_SIZE_C'::h5tget_size_c
+              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TGET_SIZE_C'::h5tget_size_c
               !DEC$ ENDIF
               INTEGER(HID_T), INTENT(IN) :: type_id
               INTEGER(SIZE_T), INTENT(OUT) :: size
@@ -494,7 +494,7 @@
               INTEGER FUNCTION h5tset_size_c(type_id, size)
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !MS$ATTRIBUTES C,reference,alias:'_H5TSET_SIZE_C'::h5tset_size_c
+              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TSET_SIZE_C'::h5tset_size_c
               !DEC$ ENDIF
               INTEGER(HID_T), INTENT(IN) :: type_id
               INTEGER(SIZE_T), INTENT(IN) :: size
@@ -557,7 +557,7 @@
               INTEGER FUNCTION h5tget_order_c(type_id, order)
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !MS$ATTRIBUTES C,reference,alias:'_H5TGET_ORDER_C'::h5tget_order_c
+              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TGET_ORDER_C'::h5tget_order_c
               !DEC$ ENDIF
               INTEGER(HID_T), INTENT(IN) :: type_id
               INTEGER, INTENT(OUT) :: order
@@ -620,7 +620,7 @@
               INTEGER FUNCTION h5tset_order_c(type_id, order)
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !MS$ATTRIBUTES C,reference,alias:'_H5TSET_ORDER_C'::h5tset_order_c
+              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TSET_ORDER_C'::h5tset_order_c
               !DEC$ ENDIF
               INTEGER(HID_T), INTENT(IN) :: type_id
               INTEGER, INTENT(IN) :: order
@@ -675,7 +675,7 @@
               INTEGER FUNCTION h5tget_precision_c (type_id, precision)
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !MS$ATTRIBUTES C,reference,alias:'_H5TGET_PRECISION_C'::h5tget_precision_c
+              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TGET_PRECISION_C'::h5tget_precision_c
               !DEC$ ENDIF
               INTEGER(HID_T), INTENT(IN) :: type_id 
               INTEGER(SIZE_T), INTENT(OUT) :: precision 
@@ -729,7 +729,7 @@
               INTEGER FUNCTION h5tset_precision_c (type_id, precision)
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !MS$ATTRIBUTES C,reference,alias:'_H5TSET_PRECISION_C'::h5tset_precision_c
+              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TSET_PRECISION_C'::h5tset_precision_c
               !DEC$ ENDIF
               INTEGER(HID_T), INTENT(IN) :: type_id 
               INTEGER(SIZE_T), INTENT(IN) :: precision 
@@ -784,7 +784,7 @@
               INTEGER FUNCTION h5tget_offset_c(type_id, offset)
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !MS$ATTRIBUTES C,reference,alias:'_H5TGET_OFFSET_C'::h5tget_offset_c
+              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TGET_OFFSET_C'::h5tget_offset_c
               !DEC$ ENDIF
               INTEGER(HID_T), INTENT(IN) :: type_id 
               INTEGER(SIZE_T), INTENT(OUT) :: offset 
@@ -839,7 +839,7 @@
               INTEGER FUNCTION h5tset_offset_c(type_id, offset)
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !MS$ATTRIBUTES C,reference,alias:'_H5TSET_OFFSET_C'::h5tset_offset_c
+              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TSET_OFFSET_C'::h5tset_offset_c
               !DEC$ ENDIF
               INTEGER(HID_T), INTENT(IN) :: type_id 
               INTEGER(SIZE_T), INTENT(IN) :: offset 
@@ -911,7 +911,7 @@
               INTEGER FUNCTION h5tget_pad_c(type_id, lsbpad, msbpad)
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !MS$ATTRIBUTES C,reference,alias:'_H5TGET_PAD_C'::h5tget_pad_c
+              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TGET_PAD_C'::h5tget_pad_c
               !DEC$ ENDIF
               INTEGER(HID_T), INTENT(IN) :: type_id
               INTEGER, INTENT(OUT) :: lsbpad 
@@ -983,7 +983,7 @@
               USE H5GLOBAL
               INTEGER(HID_T), INTENT(IN) :: type_id
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !MS$ATTRIBUTES C,reference,alias:'_H5TSET_PAD_C'::h5tset_pad_c
+              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TSET_PAD_C'::h5tset_pad_c
               !DEC$ ENDIF
               INTEGER, INTENT(IN) :: lsbpad 
               INTEGER, INTENT(IN) :: msbpad
@@ -1047,7 +1047,7 @@
               INTEGER FUNCTION h5tget_sign_c(type_id, sign)
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !MS$ATTRIBUTES C,reference,alias:'_H5TGET_SIGN_C'::h5tget_sign_c
+              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TGET_SIGN_C'::h5tget_sign_c
               !DEC$ ENDIF
               INTEGER(HID_T), INTENT(IN) :: type_id
               INTEGER, INTENT(OUT) :: sign
@@ -1111,7 +1111,7 @@
               INTEGER FUNCTION h5tset_sign_c(type_id, sign)
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !MS$ATTRIBUTES C,reference,alias:'_H5TSET_SIGN_C'::h5tset_sign_c
+              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TSET_SIGN_C'::h5tset_sign_c
               !DEC$ ENDIF
               INTEGER(HID_T), INTENT(IN) :: type_id
               INTEGER, INTENT(IN) :: sign
@@ -1171,7 +1171,7 @@
               INTEGER FUNCTION h5tget_fields_c(type_id, epos, esize, mpos, msize)
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !MS$ATTRIBUTES C,reference,alias:'_H5TGET_FIELDS_C'::h5tget_fields_c
+              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TGET_FIELDS_C'::h5tget_fields_c
               !DEC$ ENDIF
               INTEGER(HID_T), INTENT(IN) :: type_id
               INTEGER, INTENT(OUT) :: epos  
@@ -1235,7 +1235,7 @@
               INTEGER FUNCTION h5tset_fields_c(type_id, epos, esize, mpos, msize)
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !MS$ATTRIBUTES C,reference,alias:'_H5TSET_FIELDS_C'::h5tset_fields_c
+              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TSET_FIELDS_C'::h5tset_fields_c
               !DEC$ ENDIF
               INTEGER(HID_T), INTENT(IN) :: type_id
               INTEGER, INTENT(IN) :: epos  
@@ -1292,7 +1292,7 @@
               INTEGER FUNCTION h5tget_ebias_c(type_id, ebias)
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !MS$ATTRIBUTES C,reference,alias:'_H5TGET_EBIAS_C'::h5tget_ebias_c
+              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TGET_EBIAS_C'::h5tget_ebias_c
               !DEC$ ENDIF
               INTEGER(HID_T), INTENT(IN) :: type_id 
               INTEGER(SIZE_T), INTENT(OUT) :: ebias
@@ -1347,7 +1347,7 @@
               INTEGER FUNCTION h5tset_ebias_c(type_id, ebias)
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !MS$ATTRIBUTES C,reference,alias:'_H5TSET_EBIAS_C'::h5tset_ebias_c
+              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TSET_EBIAS_C'::h5tset_ebias_c
               !DEC$ ENDIF
               INTEGER(HID_T), INTENT(IN) :: type_id 
               INTEGER(SIZE_T), INTENT(IN) :: ebias
@@ -1410,7 +1410,7 @@
               INTEGER FUNCTION h5tget_norm_c(type_id, norm)
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !MS$ATTRIBUTES C,reference,alias:'_H5TGET_NORM_C'::h5tget_norm_c
+              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TGET_NORM_C'::h5tget_norm_c
               !DEC$ ENDIF
               INTEGER(HID_T), INTENT(IN) :: type_id
               INTEGER, INTENT(OUT) :: norm
@@ -1473,7 +1473,7 @@
               INTEGER FUNCTION h5tset_norm_c(type_id, norm)
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !MS$ATTRIBUTES C,reference,alias:'_H5TSET_NORM_C'::h5tset_norm_c
+              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TSET_NORM_C'::h5tset_norm_c
               !DEC$ ENDIF
               INTEGER(HID_T), INTENT(IN) :: type_id
               INTEGER, INTENT(IN) :: norm
@@ -1538,7 +1538,7 @@
               INTEGER FUNCTION h5tget_inpad_c(type_id, padtype)
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !MS$ATTRIBUTES C,reference,alias:'_H5TGET_INPAD_C'::h5tget_inpad_c
+              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TGET_INPAD_C'::h5tget_inpad_c
               !DEC$ ENDIF
               INTEGER(HID_T), INTENT(IN) :: type_id
               INTEGER, INTENT(OUT) :: padtype
@@ -1601,7 +1601,7 @@
               INTEGER FUNCTION h5tset_inpad_c(type_id, padtype)
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !MS$ATTRIBUTES C,reference,alias:'_H5TSET_INPAD_C'::h5tset_inpad_c
+              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TSET_INPAD_C'::h5tset_inpad_c
               !DEC$ ENDIF
               INTEGER(HID_T), INTENT(IN) :: type_id
               INTEGER, INTENT(IN) :: padtype
@@ -1659,7 +1659,7 @@
               INTEGER FUNCTION h5tget_cset_c(type_id, cset)
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !MS$ATTRIBUTES C,reference,alias:'_H5TGET_CSET_C'::h5tget_cset_c
+              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TGET_CSET_C'::h5tget_cset_c
               !DEC$ ENDIF
               INTEGER(HID_T), INTENT(IN) :: type_id
               INTEGER, INTENT(OUT) :: cset
@@ -1717,7 +1717,7 @@
               INTEGER FUNCTION h5tset_cset_c(type_id, cset)
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !MS$ATTRIBUTES C,reference,alias:'_H5TSET_CSET_C'::h5tset_cset_c
+              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TSET_CSET_C'::h5tset_cset_c
               !DEC$ ENDIF
               INTEGER(HID_T), INTENT(IN) :: type_id
               INTEGER, INTENT(IN) :: cset
@@ -1776,7 +1776,7 @@
               INTEGER FUNCTION h5tget_strpad_c(type_id, strpad)
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !MS$ATTRIBUTES C,reference,alias:'_H5TGET_STRPAD_C'::h5tget_strpad_c
+              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TGET_STRPAD_C'::h5tget_strpad_c
               !DEC$ ENDIF
               INTEGER(HID_T), INTENT(IN) :: type_id
               INTEGER, INTENT(OUT) :: strpad
@@ -1835,7 +1835,7 @@
               INTEGER FUNCTION h5tset_strpad_c(type_id, strpad)
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !MS$ATTRIBUTES C,reference,alias:'_H5TSET_STRPAD_C'::h5tset_strpad_c
+              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TSET_STRPAD_C'::h5tset_strpad_c
               !DEC$ ENDIF
               INTEGER(HID_T), INTENT(IN) :: type_id
               INTEGER, INTENT(IN) :: strpad
@@ -1890,7 +1890,7 @@
               INTEGER FUNCTION h5tget_nmembers_c(type_id, num_members)
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !MS$ATTRIBUTES C,reference,alias:'_H5TGET_NMEMBERS_C'::h5tget_nmembers_c
+              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TGET_NMEMBERS_C'::h5tget_nmembers_c
               !DEC$ ENDIF
               INTEGER(HID_T), INTENT(IN) :: type_id
               INTEGER, INTENT(OUT) :: num_members
@@ -1949,7 +1949,7 @@
               INTEGER FUNCTION h5tget_member_name_c(type_id, index, member_name, namelen)
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !MS$ATTRIBUTES C,reference,alias:'_H5TGET_MEMBER_NAME_C'::h5tget_member_name_c
+              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TGET_MEMBER_NAME_C'::h5tget_member_name_c
               !DEC$ ENDIF
               !DEC$ATTRIBUTES reference :: member_name
               INTEGER(HID_T), INTENT(IN) :: type_id 
@@ -2009,7 +2009,7 @@
               INTEGER FUNCTION h5tget_member_offset_c(type_id, member_no, offset )
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !MS$ATTRIBUTES C,reference,alias:'_H5TGET_MEMBER_OFFSET_C'::h5tget_member_offset_c
+              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TGET_MEMBER_OFFSET_C'::h5tget_member_offset_c
               !DEC$ ENDIF
               INTEGER(HID_T), INTENT(IN) :: type_id
               INTEGER, INTENT(IN) :: member_no
@@ -2062,7 +2062,7 @@
               INTEGER FUNCTION h5tget_member_index_c(type_id, name, namelen, index)
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !MS$ATTRIBUTES C,reference,alias:'_H5TGET_MEMBER_INDEX_C'::h5tget_member_index_c
+              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TGET_MEMBER_INDEX_C'::h5tget_member_index_c
               !DEC$ ENDIF
               !DEC$ATTRIBUTES reference ::name 
               INTEGER(HID_T), INTENT(IN) :: type_id
@@ -2170,7 +2170,7 @@
               INTEGER FUNCTION h5tget_array_dims_c(type_id, dims)
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !MS$ATTRIBUTES C,reference,alias:'_H5TGET_ARRAY_DIMS_C'::h5tget_array_dims_c
+              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TGET_ARRAY_DIMS_C'::h5tget_array_dims_c
               !DEC$ ENDIF
               INTEGER(HID_T), INTENT(IN) :: type_id
               INTEGER(HSIZE_T),DIMENSION(*), INTENT(OUT) ::  dims
@@ -2226,7 +2226,7 @@
               INTEGER FUNCTION h5tget_array_ndims_c(type_id, ndims)
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !MS$ATTRIBUTES C,reference,alias:'_H5TGET_ARRAY_NDIMS_C'::h5tget_array_ndims_c
+              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TGET_ARRAY_NDIMS_C'::h5tget_array_ndims_c
               !DEC$ ENDIF
               INTEGER(HID_T), INTENT(IN) :: type_id
               INTEGER, INTENT(OUT) ::  ndims
@@ -2283,7 +2283,7 @@
               INTEGER FUNCTION h5tget_super_c(type_id, base_type_id)
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !MS$ATTRIBUTES C,reference,alias:'_H5TGET_SUPER_C'::h5tget_super_c
+              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TGET_SUPER_C'::h5tget_super_c
               !DEC$ ENDIF
               INTEGER(HID_T), INTENT(IN) :: type_id 
               INTEGER(HID_T), INTENT(OUT) :: base_type_id
@@ -2342,7 +2342,7 @@
               INTEGER FUNCTION h5tget_member_type_c(type_id, field_idx , datatype)
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !MS$ATTRIBUTES C,reference,alias:'_H5TGET_MEMBER_TYPE_C'::h5tget_member_type_c
+              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TGET_MEMBER_TYPE_C'::h5tget_member_type_c
               !DEC$ ENDIF
               INTEGER(HID_T), INTENT(IN) :: type_id
               INTEGER, INTENT(IN) :: field_idx
@@ -2406,7 +2406,7 @@
               INTEGER FUNCTION h5tcreate_c(class, size, type_id)
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !MS$ATTRIBUTES C,reference,alias:'_H5TCREATE_C'::h5tcreate_c
+              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TCREATE_C'::h5tcreate_c
               !DEC$ ENDIF
               INTEGER, INTENT(IN) :: class 
               INTEGER(SIZE_T), INTENT(IN) :: size 
@@ -2469,7 +2469,7 @@
               INTEGER FUNCTION h5tinsert_c(type_id, name, namelen, offset, field_id)
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !MS$ATTRIBUTES C,reference,alias:'_H5TINSERT_C'::h5tinsert_c
+              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TINSERT_C'::h5tinsert_c
               !DEC$ ENDIF
               !DEC$ATTRIBUTES reference :: name
               INTEGER(HID_T), INTENT(IN) :: type_id
@@ -2526,7 +2526,7 @@
               INTEGER FUNCTION h5tpack_c(type_id)
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !MS$ATTRIBUTES C,reference,alias:'_H5TPACK_C'::h5tpack_c
+              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TPACK_C'::h5tpack_c
               !DEC$ ENDIF
               INTEGER(HID_T), INTENT(IN) :: type_id
               END FUNCTION h5tpack_c
@@ -2640,7 +2640,7 @@
               INTEGER FUNCTION h5tarray_create_c(base_id, rank, dims, type_id)
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !MS$ATTRIBUTES C,reference,alias:'_H5TARRAY_CREATE_C'::h5tarray_create_c
+              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TARRAY_CREATE_C'::h5tarray_create_c
               !DEC$ ENDIF
               INTEGER(HID_T), INTENT(IN) :: base_id
               INTEGER, INTENT(IN) ::  rank
@@ -2701,7 +2701,7 @@
               INTEGER FUNCTION h5tenum_create_c(parent_id, new_type_id)
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !MS$ATTRIBUTES C,reference,alias:'_H5TENUM_CREATE_C'::h5tenum_create_c
+              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TENUM_CREATE_C'::h5tenum_create_c
               !DEC$ ENDIF
               INTEGER(HID_T), INTENT(IN) :: parent_id 
               INTEGER(HID_T), INTENT(OUT) :: new_type_id 
@@ -2756,7 +2756,7 @@
               INTEGER FUNCTION h5tenum_insert_c(type_id, name, namelen, value)
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !MS$ATTRIBUTES C,reference,alias:'_H5TENUM_INSERT_C'::h5tenum_insert_c
+              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TENUM_INSERT_C'::h5tenum_insert_c
               !DEC$ ENDIF
               !DEC$ATTRIBUTES reference :: name
               INTEGER(HID_T), INTENT(IN) :: type_id 
@@ -2819,7 +2819,7 @@
               INTEGER FUNCTION h5tenum_nameof_c(type_id, value, name, namelen)
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !MS$ATTRIBUTES C,reference,alias:'_H5TENUM_NAMEOF_C'::h5tenum_nameof_c
+              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TENUM_NAMEOF_C'::h5tenum_nameof_c
               !DEC$ ENDIF
               !DEC$ATTRIBUTES reference :: name
               INTEGER(HID_T), INTENT(IN) :: type_id 
@@ -2880,7 +2880,7 @@
               INTEGER FUNCTION h5tenum_valueof_c(type_id, name, namelen,  value)
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !MS$ATTRIBUTES C,reference,alias:'_H5TENUM_VALUEOF_C'::h5tenum_valueof_c
+              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TENUM_VALUEOF_C'::h5tenum_valueof_c
               !DEC$ ENDIF
               !DEC$ATTRIBUTES reference :: name
               INTEGER(HID_T), INTENT(IN) :: type_id 
@@ -2940,7 +2940,7 @@
               INTEGER FUNCTION h5tget_member_value_c(type_id, member_no, value)
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !MS$ATTRIBUTES C,reference,alias:'_H5TGET_MEMBER_VALUE_C'::h5tget_member_value_c
+              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TGET_MEMBER_VALUE_C'::h5tget_member_value_c
               !DEC$ ENDIF
               INTEGER(HID_T), INTENT(IN) :: type_id 
               INTEGER, INTENT(IN) :: member_no
@@ -2998,7 +2998,7 @@
               INTEGER FUNCTION h5tset_tag_c(type_id, tag, namelen)
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !MS$ATTRIBUTES C,reference,alias:'_H5TSET_TAG_C'::h5tset_tag_c
+              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TSET_TAG_C'::h5tset_tag_c
               !DEC$ ENDIF
               !DEC$ATTRIBUTES reference :: tag
               INTEGER(HID_T), INTENT(IN) :: type_id
@@ -3058,7 +3058,7 @@
               INTEGER FUNCTION h5tget_tag_c(type_id, tag, taglen)
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !MS$ATTRIBUTES C,reference,alias:'_H5TGET_TAG_C'::h5tget_tag_c
+              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TGET_TAG_C'::h5tget_tag_c
               !DEC$ ENDIF
               !DEC$ATTRIBUTES reference :: tag
               INTEGER(HID_T), INTENT(IN) :: type_id
@@ -3109,7 +3109,7 @@
               INTEGER FUNCTION h5tvlen_create_c(type_id, vltype_id)
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !MS$ATTRIBUTES C,reference,alias:'_H5TVLEN_CREATE_C'::h5tvlen_create_c
+              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TVLEN_CREATE_C'::h5tvlen_create_c
               !DEC$ ENDIF
               INTEGER(HID_T), INTENT(IN)  :: type_id
               INTEGER(HID_T), INTENT(OUT) :: vltype_id
@@ -3166,7 +3166,7 @@
               INTEGER FUNCTION h5tis_variable_str_c(type_id, flag) 
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !MS$ATTRIBUTES C,reference,alias:'_H5TIS_VARIABLE_STR_C'::h5tis_variable_str_c
+              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TIS_VARIABLE_STR_C'::h5tis_variable_str_c
               !DEC$ ENDIF
               INTEGER(HID_T), INTENT(IN) :: type_id
               INTEGER :: flag
@@ -3236,7 +3236,7 @@
               INTEGER FUNCTION h5tget_member_class_c(type_id, member_no, class) 
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !MS$ATTRIBUTES C,reference,alias:'_H5TGET_MEMBER_CLASS_C'::h5tget_member_class_c
+              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TGET_MEMBER_CLASS_C'::h5tget_member_class_c
               !DEC$ ENDIF
               INTEGER(HID_T), INTENT(IN) :: type_id
               INTEGER, INTENT(IN)       :: member_no