[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, 10 insertions, 10 deletions

diff --git a/fortran/src/H5_ff.f90 b/fortran/src/H5_ff.f90
index 1fb2cae..eeffa34 100644
--- a/fortran/src/H5_ff.f90
+++ b/fortran/src/H5_ff.f90
@@ -60,7 +60,7 @@
         INTERFACE
           INTEGER FUNCTION h5open_c()
           !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-          !MS$ATTRIBUTES C,reference,alias:'_H5OPEN_C'::h5open_c
+          !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5OPEN_C'::h5open_c
           !DEC$ ENDIF
           END FUNCTION h5open_c
         END INTERFACE
@@ -71,7 +71,7 @@
           INTEGER(HID_T), DIMENSION(FLOATING_TYPES_LEN) :: f_types
           INTEGER(HID_T), DIMENSION(INTEGER_TYPES_LEN) :: i_types   
           !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-          !MS$ATTRIBUTES C,reference,alias:'_H5INIT_TYPES_C'::h5init_types_c
+          !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5INIT_TYPES_C'::h5init_types_c
           !DEC$ ENDIF
           END FUNCTION h5init_types_c
         END INTERFACE
@@ -100,7 +100,7 @@
           INTEGER i_H5T_flags(H5T_FLAGS_LEN)
           INTEGER i_H5Z_flags(H5Z_FLAGS_LEN)
           !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-          !MS$ATTRIBUTES C,reference,alias:'_H5INIT_FLAGS_C'::h5init_flags_c
+          !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5INIT_FLAGS_C'::h5init_flags_c
           !DEC$ ENDIF
           END FUNCTION h5init_flags_c
         END INTERFACE
@@ -109,7 +109,7 @@
           USE H5GLOBAL
           INTEGER i_H5LIB_flags(H5LIB_FLAGS_LEN)
           !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-          !MS$ATTRIBUTES C,reference,alias:'_H5INIT1_FLAGS_C'::h5init1_flags_c
+          !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5INIT1_FLAGS_C'::h5init1_flags_c
           !DEC$ ENDIF
           END FUNCTION h5init1_flags_c
         END INTERFACE
@@ -169,7 +169,7 @@
         INTERFACE
           INTEGER FUNCTION h5close_c()
           !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-          !MS$ATTRIBUTES C,reference,alias:'_H5CLOSE_C'::h5close_c
+          !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5CLOSE_C'::h5close_c
           !DEC$ ENDIF
           END FUNCTION h5close_c
         END INTERFACE
@@ -185,7 +185,7 @@
           INTEGER(HID_T), DIMENSION(F_TYPES_LEN) :: f_types
           INTEGER(HID_T), DIMENSION(I_TYPES_LEN) :: i_types   
           !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-          !MS$ATTRIBUTES C,reference,alias:'_H5CLOSE_TYPES_C'::h5close_types_c
+          !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5CLOSE_TYPES_C'::h5close_types_c
           !DEC$ ENDIF
           END FUNCTION h5close_types_c
         END INTERFACE
@@ -233,7 +233,7 @@
         INTERFACE
           INTEGER FUNCTION h5get_libversion_c(majnum, minnum, relnum)
           !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-          !MS$ATTRIBUTES C,reference,alias:'_H5GET_LIBVERSION_C'::h5get_libversion_c
+          !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5GET_LIBVERSION_C'::h5get_libversion_c
           !DEC$ ENDIF
           INTEGER, INTENT(OUT) :: majnum, minnum, relnum
           END FUNCTION h5get_libversion_c
@@ -280,7 +280,7 @@
         INTERFACE
           INTEGER FUNCTION h5check_version_c(majnum, minnum, relnum)
           !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-          !MS$ATTRIBUTES C,reference,alias:'_H5CHECK_VERSION_C'::h5check_version_c
+          !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5CHECK_VERSION_C'::h5check_version_c
           !DEC$ ENDIF
           INTEGER, INTENT(IN) :: majnum, minnum, relnum
           END FUNCTION h5check_version_c
@@ -324,7 +324,7 @@
         INTERFACE
           INTEGER FUNCTION h5garbage_collect_c()
           !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-          !MS$ATTRIBUTES C,reference,alias:'_H5GARBAGE_COLLECT_C'::h5garbage_collect_c
+          !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5GARBAGE_COLLECT_C'::h5garbage_collect_c
           !DEC$ ENDIF
           END FUNCTION h5garbage_collect_c
         END INTERFACE
@@ -367,7 +367,7 @@
         INTERFACE
           INTEGER FUNCTION h5dont_atexit_c()
           !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-          !MS$ATTRIBUTES C,reference,alias:'_H5DONT_ATEXIT_C'::h5dont_atexit_c
+          !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5DONT_ATEXIT_C'::h5dont_atexit_c
           !DEC$ ENDIF
           END FUNCTION h5dont_atexit_c
         END INTERFACE