diff options
| author | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2014-12-23 15:08:55 (GMT) |
|---|---|---|
| committer | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2014-12-23 15:08:55 (GMT) |
| commit | fc8767cf82b818a8165cc66b4e064eb806fa9f47 (patch) | |
| tree | d50e0705384c58fae24668c56ddc50f24dca98fb | |
| parent | d4e70e8caeea4d4aa632fe10f83cd184fe0757e4 (diff) | |
| download | hdf5-fc8767cf82b818a8165cc66b4e064eb806fa9f47.zip hdf5-fc8767cf82b818a8165cc66b4e064eb806fa9f47.tar.gz hdf5-fc8767cf82b818a8165cc66b4e064eb806fa9f47.tar.bz2 | |
[svn-r25923] Added name to the BIND(C) attribute, removed the !DEC$ statements for windows.
| -rw-r--r-- | fortran/src/H5Af.c | 2 | ||||
| -rw-r--r-- | fortran/src/H5Aff_F03.f90 | 5 | ||||
| -rw-r--r-- | fortran/src/H5f90proto.h | 3 |
3 files changed, 3 insertions, 7 deletions
diff --git a/fortran/src/H5Af.c b/fortran/src/H5Af.c index 896736d..f7121d2 100644 --- a/fortran/src/H5Af.c +++ b/fortran/src/H5Af.c @@ -2099,7 +2099,7 @@ done: * SOURCE */ int_f -nh5awrite_f_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf) +h5awrite_f_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf) /******/ { int ret_value = -1; diff --git a/fortran/src/H5Aff_F03.f90 b/fortran/src/H5Aff_F03.f90 index 807f6fa..1c83320 100644 --- a/fortran/src/H5Aff_F03.f90 +++ b/fortran/src/H5Aff_F03.f90 @@ -143,12 +143,9 @@ MODULE H5A_PROVISIONAL ! to the C H5Awrite routine INTERFACE - INTEGER FUNCTION h5awrite_f_c(attr_id, mem_type_id, buf) + INTEGER FUNCTION h5awrite_f_c(attr_id, mem_type_id, buf) BIND(C, NAME='h5awrite_f_c') USE H5GLOBAL USE, INTRINSIC :: ISO_C_BINDING - !DEC$IF DEFINED(HDF5F90_WINDOWS) - !DEC$ATTRIBUTES C,reference,decorate,alias:'H5AWRITE_F_C'::h5awrite_f_c - !DEC$ENDIF INTEGER(HID_T), INTENT(IN) :: attr_id INTEGER(HID_T), INTENT(IN) :: mem_type_id TYPE(C_PTR), VALUE :: buf diff --git a/fortran/src/H5f90proto.h b/fortran/src/H5f90proto.h index a0a4f64..fde5f20 100644 --- a/fortran/src/H5f90proto.h +++ b/fortran/src/H5f90proto.h @@ -490,7 +490,6 @@ H5_FCDLL int_f nh5gget_info_by_name_c(hid_t_f *loc_id, _fcd group_name, size_t_f #define nh5awritec_5_c H5_FC_FUNC_(h5awritec_5_c, H5AWRITEC_5_C) #define nh5awritec_6_c H5_FC_FUNC_(h5awritec_6_c, H5AWRITEC_6_C) #define nh5awritec_7_c H5_FC_FUNC_(h5awritec_7_c, H5AWRITEC_7_C) -#define nh5awrite_f_c H5_FC_FUNC_(h5awrite_f_c, H5AWRITE_F_C) #define nh5aread_c H5_FC_FUNC_(h5aread_c, H5AREAD_C) #define nh5aread_integer_s_c H5_FC_FUNC_(h5aread_integer_s_c, H5AREAD_INTEGER_S_C) #define nh5aread_integer_1_c H5_FC_FUNC_(h5aread_integer_1_c, H5AREAD_INTEGER_1_C) @@ -586,7 +585,7 @@ H5_FCDLL int_f nh5awrite_double_4_c (hid_t_f *attr_id, hid_t_f *mem_type_id, voi H5_FCDLL int_f nh5awrite_double_5_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims); H5_FCDLL int_f nh5awrite_double_6_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims); H5_FCDLL int_f nh5awrite_double_7_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims); -H5_FCDLL int_f nh5awrite_f_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf); +H5_FCDLL int_f h5awrite_f_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf); H5_FCDLL int_f nh5areadc_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims); H5_FCDLL int_f nh5areadc_s_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims); H5_FCDLL int_f nh5areadc_1_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims); |