From 1cd07720f6b1d05c8ef0856f79f70543edcc4fe8 Mon Sep 17 00:00:00 2001 From: Allen Byrne Date: Mon, 30 Mar 2015 13:23:13 -0500 Subject: [svn-r26658] Correct windows define for exports/imports --- hl/fortran/src/H5DSff.f90 | 16 ++-- hl/fortran/src/H5IMff.f90 | 24 +++--- hl/fortran/src/H5LTff.f90 | 202 +++++++++++++++++++++++----------------------- hl/fortran/src/H5TBff.f90 | 48 +++++------ 4 files changed, 145 insertions(+), 145 deletions(-) diff --git a/hl/fortran/src/H5DSff.f90 b/hl/fortran/src/H5DSff.f90 index 9761a38..04540a6 100644 --- a/hl/fortran/src/H5DSff.f90 +++ b/hl/fortran/src/H5DSff.f90 @@ -48,7 +48,7 @@ CONTAINS ! !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5dsset_scale_f !DEC$endif ! @@ -106,7 +106,7 @@ CONTAINS ! !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5dsattach_scale_f !DEC$endif ! @@ -159,7 +159,7 @@ CONTAINS ! !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5dsdetach_scale_f !DEC$endif ! @@ -213,7 +213,7 @@ CONTAINS ! !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5dsis_attached_f !DEC$endif ! @@ -281,7 +281,7 @@ CONTAINS ! !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5dsis_scale_f !DEC$endif ! @@ -338,7 +338,7 @@ CONTAINS ! !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5dsset_label_f !DEC$endif ! @@ -397,7 +397,7 @@ CONTAINS ! !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5dsget_label_f !DEC$endif ! @@ -455,7 +455,7 @@ CONTAINS ! !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5dsget_scale_name_f !DEC$endif ! diff --git a/hl/fortran/src/H5IMff.f90 b/hl/fortran/src/H5IMff.f90 index c389a2e..50c6d8b 100644 --- a/hl/fortran/src/H5IMff.f90 +++ b/hl/fortran/src/H5IMff.f90 @@ -51,7 +51,7 @@ subroutine h5immake_image_8bit_f(loc_id,& ! !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5immake_image_8bit_f !DEC$endif ! @@ -115,7 +115,7 @@ subroutine h5imread_image_f(loc_id,& ! !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5imread_image_f !DEC$endif ! @@ -175,7 +175,7 @@ subroutine h5immake_image_24bit_f(loc_id,& ! !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5immake_image_24bit_f !DEC$endif ! @@ -249,7 +249,7 @@ subroutine h5imget_image_info_f(loc_id,& ! !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5imget_image_info_f !DEC$endif ! @@ -317,7 +317,7 @@ integer function h5imis_image_f(loc_id,& ! !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5imis_image_f !DEC$endif ! @@ -375,7 +375,7 @@ subroutine h5immake_palette_f(loc_id,& ! !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5immake_palette_f !DEC$endif ! @@ -436,7 +436,7 @@ subroutine h5imlink_palette_f(loc_id,& ! !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5imlink_palette_f !DEC$endif ! @@ -497,7 +497,7 @@ subroutine h5imunlink_palette_f(loc_id,& ! !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5imunlink_palette_f !DEC$endif ! @@ -561,7 +561,7 @@ subroutine h5imget_npalettes_f(loc_id,& ! !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5imget_npalettes_f !DEC$endif ! @@ -621,7 +621,7 @@ subroutine h5imget_palette_info_f(loc_id,& ! !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5imget_palette_info_f !DEC$endif ! @@ -684,7 +684,7 @@ subroutine h5imget_palette_f(loc_id,& ! !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5imget_palette_f !DEC$endif ! @@ -742,7 +742,7 @@ integer function h5imis_palette_f(loc_id,& ! !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5imis_palette_f !DEC$endif ! diff --git a/hl/fortran/src/H5LTff.f90 b/hl/fortran/src/H5LTff.f90 index 9c3baff..9393f7f 100644 --- a/hl/fortran/src/H5LTff.f90 +++ b/hl/fortran/src/H5LTff.f90 @@ -163,7 +163,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltmake_dataset_f_int1 !DEC$endif ! @@ -229,7 +229,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltmake_dataset_f_int2 !DEC$endif ! @@ -297,7 +297,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltmake_dataset_f_int3 !DEC$endif ! @@ -360,7 +360,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltmake_dataset_f_int4 !DEC$endif ! @@ -423,7 +423,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltmake_dataset_f_int5 !DEC$endif ! @@ -486,7 +486,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltmake_dataset_f_int6 !DEC$endif ! @@ -549,7 +549,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltmake_dataset_f_int7 !DEC$endif ! @@ -618,7 +618,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltmake_dataset_f_float1 !DEC$endif ! @@ -684,7 +684,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltmake_dataset_f_float2 !DEC$endif ! @@ -752,7 +752,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltmake_dataset_f_float3 !DEC$endif ! @@ -815,7 +815,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltmake_dataset_f_float4 !DEC$endif ! @@ -878,7 +878,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltmake_dataset_f_float5 !DEC$endif ! @@ -941,7 +941,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltmake_dataset_f_float6 !DEC$endif ! @@ -1004,7 +1004,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltmake_dataset_f_float7 !DEC$endif ! @@ -1072,7 +1072,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltmake_dataset_f_double1 !DEC$endif ! @@ -1138,7 +1138,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltmake_dataset_f_double2 !DEC$endif ! @@ -1206,7 +1206,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltmake_dataset_f_double3 !DEC$endif ! @@ -1269,7 +1269,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltmake_dataset_f_double4 !DEC$endif ! @@ -1332,7 +1332,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltmake_dataset_f_double5 !DEC$endif ! @@ -1395,7 +1395,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltmake_dataset_f_double6 !DEC$endif ! @@ -1458,7 +1458,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltmake_dataset_f_double7 !DEC$endif ! @@ -1525,7 +1525,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltread_dataset_f_int1 !DEC$endif ! @@ -1588,7 +1588,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltread_dataset_f_int2 !DEC$endif ! @@ -1653,7 +1653,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltread_dataset_f_int3 !DEC$endif ! @@ -1714,7 +1714,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltread_dataset_f_int4 !DEC$endif ! @@ -1775,7 +1775,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltread_dataset_f_int5 !DEC$endif ! @@ -1836,7 +1836,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltread_dataset_f_int6 !DEC$endif ! @@ -1897,7 +1897,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltread_dataset_f_int7 !DEC$endif ! @@ -1963,7 +1963,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltread_dataset_f_float1 !DEC$endif ! @@ -2026,7 +2026,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltread_dataset_f_float2 !DEC$endif ! @@ -2092,7 +2092,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltread_dataset_f_float3 !DEC$endif ! @@ -2153,7 +2153,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltread_dataset_f_float4 !DEC$endif ! @@ -2214,7 +2214,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltread_dataset_f_float5 !DEC$endif ! @@ -2275,7 +2275,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltread_dataset_f_float6 !DEC$endif ! @@ -2336,7 +2336,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltread_dataset_f_float7 !DEC$endif ! @@ -2402,7 +2402,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport ::h5ltread_dataset_f_double1 !DEC$endif ! @@ -2465,7 +2465,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltread_dataset_f_double2 !DEC$endif ! @@ -2530,7 +2530,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltread_dataset_f_double3 !DEC$endif ! @@ -2591,7 +2591,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltread_dataset_f_double4 !DEC$endif ! @@ -2652,7 +2652,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltread_dataset_f_double5 !DEC$endif ! @@ -2713,7 +2713,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltread_dataset_f_double6 !DEC$endif ! @@ -2774,7 +2774,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltread_dataset_f_double7 !DEC$endif ! @@ -2839,7 +2839,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltmake_dataset_int_f_1 !DEC$endif ! @@ -2903,7 +2903,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltmake_dataset_int_f_2 !DEC$endif ! @@ -2971,7 +2971,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltmake_dataset_int_f_3 !DEC$endif ! @@ -3034,7 +3034,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltmake_dataset_int_f_4 !DEC$endif ! @@ -3097,7 +3097,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltmake_dataset_int_f_5 !DEC$endif ! @@ -3160,7 +3160,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltmake_dataset_int_f_6 !DEC$endif ! @@ -3223,7 +3223,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltmake_dataset_int_f_7 !DEC$endif ! @@ -3290,7 +3290,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltmake_dataset_float_f_1 !DEC$endif ! @@ -3354,7 +3354,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltmake_dataset_float_f_2 !DEC$endif ! @@ -3420,7 +3420,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltmake_dataset_float_f_3 !DEC$endif ! @@ -3482,7 +3482,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltmake_dataset_float_f_4 !DEC$endif ! @@ -3544,7 +3544,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltmake_dataset_float_f_5 !DEC$endif ! @@ -3606,7 +3606,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltmake_dataset_float_f_6 !DEC$endif ! @@ -3668,7 +3668,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltmake_dataset_float_f_7 !DEC$endif ! @@ -3735,7 +3735,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltmake_dataset_double_f_1 !DEC$endif ! @@ -3802,7 +3802,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltmake_dataset_double_f_2 !DEC$endif ! @@ -3868,7 +3868,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltmake_dataset_double_f_3 !DEC$endif ! @@ -3930,7 +3930,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltmake_dataset_double_f_4 !DEC$endif ! @@ -3992,7 +3992,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltmake_dataset_double_f_5 !DEC$endif ! @@ -4054,7 +4054,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltmake_dataset_double_f_5 !DEC$endif ! @@ -4116,7 +4116,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltmake_dataset_double_f_5 !DEC$endif ! @@ -4181,7 +4181,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltread_dataset_int_f_1 !DEC$endif ! @@ -4245,7 +4245,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltread_dataset_int_f_2 !DEC$endif ! @@ -4308,7 +4308,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltread_dataset_int_f_3 !DEC$endif ! @@ -4367,7 +4367,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltread_dataset_int_f_4 !DEC$endif ! @@ -4426,7 +4426,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltread_dataset_int_f_5 !DEC$endif ! @@ -4485,7 +4485,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltread_dataset_int_f_6 !DEC$endif ! @@ -4544,7 +4544,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltread_dataset_int_f_7 !DEC$endif ! @@ -4608,7 +4608,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltread_dataset_float_f_1 !DEC$endif ! @@ -4672,7 +4672,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltread_dataset_float_f_2 !DEC$endif ! @@ -4735,7 +4735,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltread_dataset_float_f_3 !DEC$endif ! @@ -4794,7 +4794,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltread_dataset_float_f_4 !DEC$endif ! @@ -4853,7 +4853,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltread_dataset_float_f_5 !DEC$endif ! @@ -4912,7 +4912,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltread_dataset_float_f_6 !DEC$endif ! @@ -4971,7 +4971,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltread_dataset_float_f_7 !DEC$endif ! @@ -5034,7 +5034,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltread_dataset_double_f_1 !DEC$endif ! @@ -5098,7 +5098,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltread_dataset_double_f_2 !DEC$endif ! @@ -5161,7 +5161,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltread_dataset_double_f_3 !DEC$endif ! @@ -5220,7 +5220,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltread_dataset_double_f_4 !DEC$endif ! @@ -5279,7 +5279,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltread_dataset_double_f_5 !DEC$endif ! @@ -5338,7 +5338,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltread_dataset_double_f_6 !DEC$endif ! @@ -5397,7 +5397,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltread_dataset_double_f_7 !DEC$endif ! @@ -5459,7 +5459,7 @@ CONTAINS IMPLICIT NONE ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltmake_dataset_string_f !DEC$endif ! @@ -5518,7 +5518,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltread_dataset_string_f !DEC$endif ! @@ -5585,7 +5585,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltset_attribute_int_f !DEC$endif ! @@ -5652,7 +5652,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltset_attribute_float_f !DEC$endif ! @@ -5719,7 +5719,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltset_attribute_double_f !DEC$endif ! @@ -5786,7 +5786,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltset_attribute_string_f !DEC$endif ! @@ -5855,7 +5855,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltget_attribute_int_f !DEC$endif ! @@ -5920,7 +5920,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltget_attribute_float_f !DEC$endif ! @@ -5984,7 +5984,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltget_attribute_double_f !DEC$endif ! @@ -6048,7 +6048,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltget_attribute_string_f !DEC$endif ! @@ -6119,7 +6119,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltget_dataset_ndims_f !DEC$endif ! @@ -6176,7 +6176,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltfind_dataset_f !DEC$endif ! @@ -6234,7 +6234,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltget_dataset_info_f !DEC$endif ! @@ -6302,7 +6302,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltget_attribute_ndims_f !DEC$endif ! @@ -6369,7 +6369,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltget_attribute_info_f !DEC$endif ! @@ -6432,11 +6432,11 @@ CONTAINS IMPLICIT NONE ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltpath_valid_f !DEC$endif ! - INTEGER(hid_t) , INTENT(IN) :: loc_id ! File or group identifier. + INTEGER(hid_t) , INTENT(IN) :: loc_id ! An identifier of an object in the file. CHARACTER(LEN=*), INTENT(IN) :: path ! Path to the object to check, relative to loc_id. LOGICAL , INTENT(IN) :: check_object_valid ! Indicates whether to check if the final component ! of the path resolves to a valid object diff --git a/hl/fortran/src/H5TBff.f90 b/hl/fortran/src/H5TBff.f90 index 29a4b42..5846f49 100644 --- a/hl/fortran/src/H5TBff.f90 +++ b/hl/fortran/src/H5TBff.f90 @@ -95,7 +95,7 @@ SUBROUTINE h5tbmake_table_f(table_title,& IMPLICIT NONE ! !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5tbmake_table_f !DEC$endif ! @@ -217,7 +217,7 @@ SUBROUTINE h5tbwrite_field_name_f_int(loc_id,& ! !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5tbwrite_field_name_f_int !DEC$endif ! @@ -293,7 +293,7 @@ SUBROUTINE h5tbwrite_field_name_f_float(loc_id,& ! !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5tbwrite_field_name_f_float !DEC$endif ! @@ -371,7 +371,7 @@ SUBROUTINE h5tbwrite_field_name_f_double(loc_id,& ! !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5tbwrite_field_name_f_double !DEC$endif ! @@ -447,7 +447,7 @@ SUBROUTINE h5tbwrite_field_name_f_string(loc_id,& ! !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5tbwrite_field_name_f_string !DEC$endif ! @@ -524,7 +524,7 @@ SUBROUTINE h5tbread_field_name_f_int(loc_id,& ! !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5tbread_field_name_f_int !DEC$endif ! @@ -600,7 +600,7 @@ SUBROUTINE h5tbread_field_name_f_float(loc_id,& ! !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5tbread_field_name_f_float !DEC$endif ! @@ -676,7 +676,7 @@ SUBROUTINE h5tbread_field_name_f_double(loc_id,& ! !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5tbread_field_name_f_double !DEC$endif ! @@ -752,7 +752,7 @@ SUBROUTINE h5tbread_field_name_f_string(loc_id,& ! !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5tbread_field_name_f_string !DEC$endif ! @@ -829,7 +829,7 @@ SUBROUTINE h5tbwrite_field_index_f_int(loc_id,& ! !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5tbwrite_field_index_f_int !DEC$endif ! @@ -901,7 +901,7 @@ SUBROUTINE h5tbwrite_field_index_f_float(loc_id,& ! !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5tbwrite_field_index_f_float !DEC$endif ! @@ -975,7 +975,7 @@ SUBROUTINE h5tbwrite_field_index_f_double(loc_id,& ! !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5tbwrite_field_index_f_double !DEC$endif ! @@ -1047,7 +1047,7 @@ SUBROUTINE h5tbwrite_field_index_f_string(loc_id,& ! !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5tbwrite_field_index_f_string !DEC$endif ! @@ -1120,7 +1120,7 @@ SUBROUTINE h5tbread_field_index_f_int(loc_id,& ! !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport ::h5tbread_field_index_f_int !DEC$endif ! @@ -1192,7 +1192,7 @@ SUBROUTINE h5tbread_field_index_f_float(loc_id,& ! !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5tbread_field_index_f_float !DEC$endif ! @@ -1264,7 +1264,7 @@ SUBROUTINE h5tbread_field_index_f_double(loc_id,& ! !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5tbread_field_index_f_double !DEC$endif ! @@ -1336,7 +1336,7 @@ SUBROUTINE h5tbread_field_index_f_string(loc_id,& ! !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5tbread_field_index_f_string !DEC$endif ! @@ -1407,7 +1407,7 @@ SUBROUTINE h5tbinsert_field_f_int(loc_id,& ! !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5tbinsert_field_f_int !DEC$endif ! @@ -1481,7 +1481,7 @@ SUBROUTINE h5tbinsert_field_f_float(loc_id,& ! !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5tbinsert_field_f_float !DEC$endif ! @@ -1555,7 +1555,7 @@ SUBROUTINE h5tbinsert_field_f_double(loc_id,& ! !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5tbinsert_field_f_double !DEC$endif ! @@ -1630,7 +1630,7 @@ SUBROUTINE h5tbinsert_field_f_string(loc_id,& ! !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5tbinsert_field_f_string !DEC$endif ! @@ -1702,7 +1702,7 @@ SUBROUTINE h5tbdelete_field_f(loc_id,& ! !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5tbdelete_field_f !DEC$endif ! @@ -1769,7 +1769,7 @@ SUBROUTINE h5tbget_table_info_f(loc_id,& ! !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5tbget_table_info_f !DEC$endif ! @@ -1834,7 +1834,7 @@ SUBROUTINE h5tbget_field_info_f(loc_id,& IMPLICIT NONE ! !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5tbget_field_info_f !DEC$endif ! -- cgit v0.12