Merge pull request #807 in HDFFV/hdf5 from ~BRTNFLD/hdf5_msb:noF77 to develop

* commit 'fbe6c69097c03cfe3f37d9ab114c0ad438fd434e': (37 commits)
  removed duplicate exports of DS subroutines
  removed duplicate exports of DS subroutines
  clean-up
  moved dll export to Module
  removed parameters
  added missing parameter
  added missing parameter
  removed duplicate exports of DS subroutines
  removed fortran comments
  exported global variables for windows
  export var.
  initialized integer constants
  Update macros
  Changed casts to const void *
  Casted pointers to void to quiet warnings on Linux.
  Added CHECK_PTR_EQ macro to testhdf5 to quiet cast warnings on Windows.
  Fixed misc Warnings flagged by VS2017.
  Made a dcpl layout struct in H5Z.c dynamic to quiet a stack size warning.
  Fixed an uninitialized filter callback struct in H5Dchunk.c and unified the naming and initialization of said struct throughout the library. This was causing a crash on VS2015 in debug mode when the debug heap complained. Fixes HDFFV-10330.
  Fixed Windows code in H5PLpath.c
  ...

1 files changed, 3 insertions, 62 deletions

diff --git a/hl/fortran/src/H5DSff.F90 b/hl/fortran/src/H5DSff.F90
index 4f0d040..2dca479 100644
--- a/hl/fortran/src/H5DSff.F90
+++ b/hl/fortran/src/H5DSff.F90
@@ -44,13 +44,6 @@ CONTAINS
 
     IMPLICIT NONE
 
-!
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_HL_DLL)
-!DEC$attributes dllexport :: h5dsset_scale_f
-!DEC$endif
-!
-
     INTEGER(hid_t),   INTENT(in) :: dsid               ! The dataset to be made a Dimension Scale
     CHARACTER(LEN=*), INTENT(in), OPTIONAL :: dimname  ! The dimension name
     INTEGER :: errcode                                 ! Error code
@@ -99,12 +92,6 @@ CONTAINS
 
     IMPLICIT NONE
 
-!
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_HL_DLL)
-!DEC$attributes dllexport :: h5dsattach_scale_f
-!DEC$endif
-!
     INTEGER(hid_t), INTENT(in) :: did     ! the dataset
     INTEGER(hid_t), INTENT(in) :: dsid    ! the scale to be attached 
     INTEGER       , INTENT(in) :: idx     ! the dimension of did that dsid is associated with.
@@ -148,13 +135,7 @@ CONTAINS
   SUBROUTINE H5DSdetach_scale_f( did, dsid, idx, errcode)
     
     IMPLICIT NONE
-    
-!
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_HL_DLL)
-!DEC$attributes dllexport :: h5dsdetach_scale_f
-!DEC$endif
-!
+
     INTEGER(hid_t), INTENT(in) :: did     ! the dataset
     INTEGER(hid_t), INTENT(in) :: dsid    ! the scale to be detached 
     INTEGER       , INTENT(in) :: idx     ! the dimension of did to detach
@@ -199,13 +180,7 @@ CONTAINS
   SUBROUTINE H5DSis_attached_f( did, dsid, idx, is_attached, errcode)
     
     IMPLICIT NONE
-    
-!
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_HL_DLL)
-!DEC$attributes dllexport :: h5dsis_attached_f
-!DEC$endif
-!
+
     INTEGER(hid_t), INTENT(in)  :: did         ! the dataset
     INTEGER(hid_t), INTENT(in)  :: dsid        ! the scale to be attached
     INTEGER       , INTENT(in)  :: idx         ! the dimension of did that dsid is associated with
@@ -264,13 +239,7 @@ CONTAINS
   SUBROUTINE H5DSis_scale_f( did, is_scale, errcode)
     
     IMPLICIT NONE
-    
-!
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_HL_DLL)
-!DEC$attributes dllexport :: h5dsis_scale_f
-!DEC$endif
-!
+
     INTEGER(hid_t), INTENT(in)  :: did         ! the data set to query
     LOGICAL       , INTENT(out) :: is_scale    ! logical:  
                                                ! .TRUE. if did is a Dimension Scale
@@ -319,13 +288,6 @@ CONTAINS
 
     IMPLICIT NONE
 
-!
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_HL_DLL)
-!DEC$attributes dllexport :: h5dsset_label_f
-!DEC$endif
-!
-
     INTEGER(hid_t),   INTENT(in) :: did    ! The dataset
     INTEGER       ,   INTENT(in) :: idx    ! The dimension
     CHARACTER(LEN=*), INTENT(in) :: label  ! The label
@@ -375,13 +337,6 @@ CONTAINS
 
     IMPLICIT NONE
 
-!
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_HL_DLL)
-!DEC$attributes dllexport :: h5dsget_label_f
-!DEC$endif
-!
-
     INTEGER(hid_t),   INTENT(in) :: did     ! The dataget
     INTEGER       ,   INTENT(in) :: idx     ! The dimension
     CHARACTER(LEN=*), INTENT(in) :: label   ! The label
@@ -430,13 +385,6 @@ CONTAINS
 
     IMPLICIT NONE
 
-!
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_HL_DLL)
-!DEC$attributes dllexport :: h5dsget_scale_name_f
-!DEC$endif
-!
-
     INTEGER(hid_t),   INTENT(in) :: did     ! The dataget
     CHARACTER(LEN=*), INTENT(out) :: name   ! The name
     INTEGER(size_t) , INTENT(inout) :: size ! The length of the name buffer
@@ -478,13 +426,6 @@ CONTAINS
   SUBROUTINE H5DSget_num_scales_f( did, idx, num_scales, errcode)
 
     IMPLICIT NONE
-
-!
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_HL_DLL)
-!DEC$attributes dllexport :: h5dsget_num_scales_f
-!DEC$endif
-!
     INTEGER(hid_t), INTENT(in)  :: did         ! the dataset
     INTEGER       , INTENT(in)  :: idx         ! the dimension of did to query
     INTEGER       , INTENT(out) :: num_scales  ! the number of Dimension Scales associated with did