diff options
author | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2010-01-08 21:47:17 (GMT) |
---|---|---|
committer | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2010-01-08 21:47:17 (GMT) |
commit | 9345b516b0dbcd5666a8c7a9d2e83f4432a3953e (patch) | |
tree | 1345b20197f1d77bcd60aacabd4ef0865188f687 /fortran/src/H5f90global.f90 | |
parent | f0623bdbeb7ddb2cfaa9bd47a0ee2975cfc71d67 (diff) | |
download | hdf5-9345b516b0dbcd5666a8c7a9d2e83f4432a3953e.zip hdf5-9345b516b0dbcd5666a8c7a9d2e83f4432a3953e.tar.gz hdf5-9345b516b0dbcd5666a8c7a9d2e83f4432a3953e.tar.bz2 |
[svn-r18099] Description:
Merged changes from trunk/fortran into the branch used:
svn merge -r 17682:18098 https://svn.hdfgroup.uiuc.edu/hdf5/trunk/fortran
Tested on: jam (intel)
amani (pgi)
Diffstat (limited to 'fortran/src/H5f90global.f90')
-rw-r--r-- | fortran/src/H5f90global.f90 | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/fortran/src/H5f90global.f90 b/fortran/src/H5f90global.f90 index 28d00f7..da21f6e 100644 --- a/fortran/src/H5f90global.f90 +++ b/fortran/src/H5f90global.f90 @@ -473,10 +473,10 @@ MODULE H5GLOBAL INTEGER, PARAMETER :: H5L_FLAGS_LEN = 6 INTEGER :: H5L_flags(H5L_FLAGS_LEN) - INTEGER :: H5L_LINK_ERROR_F - INTEGER :: H5L_LINK_HARD_F - INTEGER :: H5L_LINK_SOFT_F - INTEGER :: H5L_LINK_EXTERNAL_F + INTEGER :: H5L_TYPE_ERROR_F + INTEGER :: H5L_TYPE_HARD_F + INTEGER :: H5L_TYPE_SOFT_F + INTEGER :: H5L_TYPE_EXTERNAL_F INTEGER :: H5L_SAME_LOC_F INTEGER :: H5L_LINK_CLASS_T_VERS_F @@ -485,10 +485,10 @@ MODULE H5GLOBAL !DEC$endif COMMON /H5L_FLAGS/ H5L_flags - EQUIVALENCE(H5L_flags(1), H5L_LINK_ERROR_F) - EQUIVALENCE(H5L_flags(2), H5L_LINK_HARD_F) - EQUIVALENCE(H5L_flags(3), H5L_LINK_SOFT_F) - EQUIVALENCE(H5L_flags(4), H5L_LINK_EXTERNAL_F) + EQUIVALENCE(H5L_flags(1), H5L_TYPE_ERROR_F) + EQUIVALENCE(H5L_flags(2), H5L_TYPE_HARD_F) + EQUIVALENCE(H5L_flags(3), H5L_TYPE_SOFT_F) + EQUIVALENCE(H5L_flags(4), H5L_TYPE_EXTERNAL_F) EQUIVALENCE(H5L_flags(5), H5L_SAME_LOC_F) EQUIVALENCE(H5L_flags(6), H5L_LINK_CLASS_T_VERS_F) ! |