diff options
| author | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2012-09-05 16:52:13 (GMT) |
|---|---|---|
| committer | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2012-09-05 16:52:13 (GMT) |
| commit | fa7b8028af70d35a3c3f89a618921ecb3351fe19 (patch) | |
| tree | ef505b3433210839c82395cfce329bb9e3bb6de0 | |
| parent | 1c9e159ffe6cf85a5c076f747758dc47eb7a111a (diff) | |
| download | hdf5-fa7b8028af70d35a3c3f89a618921ecb3351fe19.zip hdf5-fa7b8028af70d35a3c3f89a618921ecb3351fe19.tar.gz hdf5-fa7b8028af70d35a3c3f89a618921ecb3351fe19.tar.bz2 | |
[svn-r22738] Fix for Windows and DLLEXPORT if statement.
Tested: jam (gnu)
| -rw-r--r-- | fortran/src/H5f90global.f90 | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/fortran/src/H5f90global.f90 b/fortran/src/H5f90global.f90 index 6943270..3d4f7f8 100644 --- a/fortran/src/H5f90global.f90 +++ b/fortran/src/H5f90global.f90 @@ -692,10 +692,16 @@ MODULE H5GLOBAL ! INTEGER, PARAMETER :: H5S_FLAGS_LEN = 19 INTEGER H5S_flags(H5S_FLAGS_LEN) + INTEGER, PARAMETER :: H5S_HSIZE_FLAGS_LEN = 1 + INTEGER(HSIZE_T) H5S_hsize_flags(H5S_HSIZE_FLAGS_LEN) !DEC$if defined(BUILD_HDF5_DLL) !DEC$ATTRIBUTES DLLEXPORT :: /H5S_FLAGS/ + !DEC$ATTRIBUTES DLLEXPORT :: /H5S_HSIZE_FLAGS/ !DEC$endif COMMON /H5S_FLAGS/ H5S_flags + COMMON /H5S_HSIZE_FLAGS/ H5S_hsize_flags + + INTEGER(HSIZE_T) :: H5S_UNLIMITED_F INTEGER :: H5S_SCALAR_F INTEGER :: H5S_SIMPLE_F @@ -720,6 +726,7 @@ MODULE H5GLOBAL INTEGER :: H5S_SEL_HYPERSLABS_F INTEGER :: H5S_SEL_ALL_F + EQUIVALENCE(H5S_hsize_flags(1), H5S_UNLIMITED_F) EQUIVALENCE(H5S_flags(1), H5S_SCALAR_F) EQUIVALENCE(H5S_flags(2), H5S_SIMPLE_F) EQUIVALENCE(H5S_flags(3), H5S_NULL_F) @@ -743,16 +750,6 @@ MODULE H5GLOBAL EQUIVALENCE(H5S_flags(18), H5S_SEL_HYPERSLABS_F) EQUIVALENCE(H5S_flags(19), H5S_SEL_ALL_F) - INTEGER, PARAMETER :: H5S_HSIZE_FLAGS_LEN = 1 - INTEGER(HSIZE_T) H5S_hsize_flags(H5S_HSIZE_FLAGS_LEN) - !DEC$if defined(BUILD_HDF5_DLL) DEC$ATTRIBUTES DLLEXPORT :: /H5S_HSIZE_FLAGS/ - !DEC$endif - COMMON /H5S_HSIZE_FLAGS/ H5S_hsize_flags - - INTEGER(HSIZE_T) :: H5S_UNLIMITED_F - - EQUIVALENCE(H5S_hsize_flags(1), H5S_UNLIMITED_F) - ! ! H5T flags declaration ! |