[svn-r27167] more DT fixes

7 files changed, 30 insertions, 26 deletions

diff --git a/hl/fortran/Makefile.in b/hl/fortran/Makefile.in
index 08cf1d8..468101e 100644
--- a/hl/fortran/Makefile.in
+++ b/hl/fortran/Makefile.in
@@ -458,6 +458,7 @@ FCFLAGS_f90 = @FCFLAGS_f90@
 FCLIBS = @FCLIBS@
 FC_VERSION = @FC_VERSION@
 FGREP = @FGREP@
+FORTRAN_C_LONG_DOUBLE_IS_UNIQUE = @FORTRAN_C_LONG_DOUBLE_IS_UNIQUE@
 FORTRAN_HAVE_C_LONG_DOUBLE = @FORTRAN_HAVE_C_LONG_DOUBLE@
 FSEARCH_DIRS = @FSEARCH_DIRS@
 GREP = @GREP@
diff --git a/hl/fortran/examples/Makefile.in b/hl/fortran/examples/Makefile.in
index 72f00da..0a58477 100644
--- a/hl/fortran/examples/Makefile.in
+++ b/hl/fortran/examples/Makefile.in
@@ -401,6 +401,7 @@ FCFLAGS_f90 = @FCFLAGS_f90@
 FCLIBS = @FCLIBS@
 FC_VERSION = @FC_VERSION@
 FGREP = @FGREP@
+FORTRAN_C_LONG_DOUBLE_IS_UNIQUE = @FORTRAN_C_LONG_DOUBLE_IS_UNIQUE@
 FORTRAN_HAVE_C_LONG_DOUBLE = @FORTRAN_HAVE_C_LONG_DOUBLE@
 FSEARCH_DIRS = @FSEARCH_DIRS@
 GREP = @GREP@
diff --git a/hl/fortran/src/H5LTff.F90 b/hl/fortran/src/H5LTff.F90
index 3216b0a..8dc20f2 100644
--- a/hl/fortran/src/H5LTff.F90
+++ b/hl/fortran/src/H5LTff.F90
@@ -59,7 +59,7 @@ MODULE h5lt
      MODULE PROCEDURE h5ltmake_dataset_f_c_double5
      MODULE PROCEDURE h5ltmake_dataset_f_c_double6
      MODULE PROCEDURE h5ltmake_dataset_f_c_double7
-#ifdef H5_FORTRAN_HAVE_C_LONG_DOUBLE
+#if FORTRAN_C_LONG_DOUBLE_IS_UNIQUE!=0
      MODULE PROCEDURE h5ltmake_dataset_f_c_long_double1
      MODULE PROCEDURE h5ltmake_dataset_f_c_long_double2
      MODULE PROCEDURE h5ltmake_dataset_f_c_long_double3
@@ -93,7 +93,7 @@ MODULE h5lt
      MODULE PROCEDURE h5ltread_dataset_f_c_double5
      MODULE PROCEDURE h5ltread_dataset_f_c_double6
      MODULE PROCEDURE h5ltread_dataset_f_c_double7
-#ifdef H5_FORTRAN_HAVE_C_LONG_DOUBLE
+#if FORTRAN_C_LONG_DOUBLE_IS_UNIQUE!=0
      MODULE PROCEDURE h5ltread_dataset_f_c_long_double1
      MODULE PROCEDURE h5ltread_dataset_f_c_long_double2
      MODULE PROCEDURE h5ltread_dataset_f_c_long_double3
@@ -130,7 +130,7 @@ MODULE h5lt
      MODULE PROCEDURE h5ltmake_dataset_c_double_f_5
      MODULE PROCEDURE h5ltmake_dataset_c_double_f_6
      MODULE PROCEDURE h5ltmake_dataset_c_double_f_7
-#ifdef H5_FORTRAN_HAVE_C_LONG_DOUBLE
+#if FORTRAN_C_LONG_DOUBLE_IS_UNIQUE!=0
      MODULE PROCEDURE h5ltmake_dataset_c_long_double_f_1
      MODULE PROCEDURE h5ltmake_dataset_c_long_double_f_2
      MODULE PROCEDURE h5ltmake_dataset_c_long_double_f_3
@@ -156,7 +156,7 @@ MODULE h5lt
      MODULE PROCEDURE h5ltmake_dataset_c_double_f_5
      MODULE PROCEDURE h5ltmake_dataset_c_double_f_6
      MODULE PROCEDURE h5ltmake_dataset_c_double_f_7
-#ifdef H5_FORTRAN_HAVE_C_LONG_DOUBLE
+#if FORTRAN_C_LONG_DOUBLE_IS_UNIQUE!=0
      MODULE PROCEDURE h5ltmake_dataset_c_long_double_f_1
      MODULE PROCEDURE h5ltmake_dataset_c_long_double_f_2
      MODULE PROCEDURE h5ltmake_dataset_c_long_double_f_3
@@ -192,7 +192,7 @@ MODULE h5lt
      MODULE PROCEDURE h5ltread_dataset_c_double_f_5
      MODULE PROCEDURE h5ltread_dataset_c_double_f_6
      MODULE PROCEDURE h5ltread_dataset_c_double_f_7
-#ifdef H5_FORTRAN_HAVE_C_LONG_DOUBLE
+#if FORTRAN_C_LONG_DOUBLE_IS_UNIQUE!=0
      MODULE PROCEDURE h5ltread_dataset_c_long_double_f_1
      MODULE PROCEDURE h5ltread_dataset_c_long_double_f_2
      MODULE PROCEDURE h5ltread_dataset_c_long_double_f_3
@@ -218,7 +218,7 @@ MODULE h5lt
      MODULE PROCEDURE h5ltread_dataset_c_double_f_5
      MODULE PROCEDURE h5ltread_dataset_c_double_f_6
      MODULE PROCEDURE h5ltread_dataset_c_double_f_7
-#ifdef H5_FORTRAN_HAVE_C_LONG_DOUBLE
+#if FORTRAN_C_LONG_DOUBLE_IS_UNIQUE!=0
      MODULE PROCEDURE h5ltread_dataset_c_long_double_f_1
      MODULE PROCEDURE h5ltread_dataset_c_long_double_f_2
      MODULE PROCEDURE h5ltread_dataset_c_long_double_f_3
@@ -892,7 +892,7 @@ CONTAINS
 
   END SUBROUTINE h5ltmake_dataset_f_c_double7
 
-#ifdef H5_FORTRAN_HAVE_C_LONG_DOUBLE
+#if FORTRAN_C_LONG_DOUBLE_IS_UNIQUE!=0
   !-------------------------------------------------------------------------
   ! Function(s): h5ltmake_dataset_f_c_long_double(1-7)
   !
@@ -1684,8 +1684,7 @@ CONTAINS
     errcode = h5ltread_dataset_c(loc_id,namelen,dset_name,type_id,f_ptr)
 
   END SUBROUTINE h5ltread_dataset_f_c_double7
-
-#ifdef H5_FORTRAN_HAVE_C_LONG_DOUBLE
+#if FORTRAN_C_LONG_DOUBLE_IS_UNIQUE!=0
   !-------------------------------------------------------------------------
   ! Function(s): h5ltread_dataset_f_c_long_double(1-7)
   !
@@ -2388,7 +2387,7 @@ CONTAINS
 
   END SUBROUTINE h5ltmake_dataset_c_double_f_7
 
-#ifdef H5_FORTRAN_HAVE_C_LONG_DOUBLE
+#if FORTRAN_C_LONG_DOUBLE_IS_UNIQUE!=0
   !-------------------------------------------------------------------------
   ! Function(s): h5ltmake_dataset_c_long_double_f_(1-7)
   !
@@ -3053,7 +3052,7 @@ CONTAINS
 
   END SUBROUTINE h5ltread_dataset_c_double_f_7
 
-#ifdef H5_FORTRAN_HAVE_C_LONG_DOUBLE
+#if FORTRAN_C_LONG_DOUBLE_IS_UNIQUE!=0
   !-------------------------------------------------------------------------
   ! Function9s): h5ltread_dataset_c_long_double_f_(1-7)
   !
diff --git a/hl/fortran/src/H5TBff.F90 b/hl/fortran/src/H5TBff.F90
index 9b40694..50eab2d 100644
--- a/hl/fortran/src/H5TBff.F90
+++ b/hl/fortran/src/H5TBff.F90
@@ -42,7 +42,7 @@ MODULE h5tb
      MODULE PROCEDURE h5tbwrite_field_name_f_int
      MODULE PROCEDURE h5tbwrite_field_name_f_c_float
      MODULE PROCEDURE h5tbwrite_field_name_f_c_double
-#ifdef H5_FORTRAN_HAVE_C_LONG_DOUBLE
+#if FORTRAN_C_LONG_DOUBLE_IS_UNIQUE!=0
      MODULE PROCEDURE h5tbwrite_field_name_f_c_long_double
 #endif
      MODULE PROCEDURE h5tbwrite_field_name_f_string
@@ -52,7 +52,7 @@ MODULE h5tb
      MODULE PROCEDURE h5tbread_field_name_f_int
      MODULE PROCEDURE h5tbread_field_name_f_c_float
      MODULE PROCEDURE h5tbread_field_name_f_c_double
-#ifdef H5_FORTRAN_HAVE_C_LONG_DOUBLE
+#if FORTRAN_C_LONG_DOUBLE_IS_UNIQUE!=0
      MODULE PROCEDURE h5tbread_field_name_f_c_long_double
 #endif
      MODULE PROCEDURE h5tbread_field_name_f_string
@@ -62,7 +62,7 @@ MODULE h5tb
      MODULE PROCEDURE h5tbwrite_field_index_f_int
      MODULE PROCEDURE h5tbwrite_field_index_f_c_float
      MODULE PROCEDURE h5tbwrite_field_index_f_c_double
-#ifdef H5_FORTRAN_HAVE_C_LONG_DOUBLE
+#if FORTRAN_C_LONG_DOUBLE_IS_UNIQUE!=0
      MODULE PROCEDURE h5tbwrite_field_index_f_c_long_double
 #endif
      MODULE PROCEDURE h5tbwrite_field_index_f_string
@@ -72,7 +72,7 @@ MODULE h5tb
      MODULE PROCEDURE h5tbread_field_index_f_int
      MODULE PROCEDURE h5tbread_field_index_f_c_float
      MODULE PROCEDURE h5tbread_field_index_f_c_double
-#ifdef H5_FORTRAN_HAVE_C_LONG_DOUBLE
+#if FORTRAN_C_LONG_DOUBLE_IS_UNIQUE!=0
      MODULE PROCEDURE h5tbread_field_index_f_c_long_double
 #endif
      MODULE PROCEDURE h5tbread_field_index_f_string
@@ -82,7 +82,7 @@ MODULE h5tb
      MODULE PROCEDURE h5tbinsert_field_f_int
      MODULE PROCEDURE h5tbinsert_field_f_c_float
      MODULE PROCEDURE h5tbinsert_field_f_c_double
-#ifdef H5_FORTRAN_HAVE_C_LONG_DOUBLE
+#if FORTRAN_C_LONG_DOUBLE_IS_UNIQUE!=0
      MODULE PROCEDURE h5tbinsert_field_f_c_long_double
 #endif
      MODULE PROCEDURE h5tbinsert_field_f_string
@@ -413,7 +413,7 @@ CONTAINS
     
   END SUBROUTINE h5tbwrite_field_name_f_c_double
 
-#ifdef H5_FORTRAN_HAVE_C_LONG_DOUBLE
+#if FORTRAN_C_LONG_DOUBLE_IS_UNIQUE!=0
   SUBROUTINE h5tbwrite_field_name_f_c_long_double(loc_id,&
        dset_name,&
        field_name,&
@@ -594,7 +594,7 @@ CONTAINS
 
   END SUBROUTINE h5tbread_field_name_f_c_double
 
-#ifdef H5_FORTRAN_HAVE_C_LONG_DOUBLE
+#if FORTRAN_C_LONG_DOUBLE_IS_UNIQUE!=0
   SUBROUTINE h5tbread_field_name_f_c_long_double(loc_id,&
        dset_name,&
        field_name,&
@@ -766,7 +766,7 @@ CONTAINS
     
   END SUBROUTINE h5tbwrite_field_index_f_c_double
 
-#ifdef H5_FORTRAN_HAVE_C_LONG_DOUBLE
+#if FORTRAN_C_LONG_DOUBLE_IS_UNIQUE!=0
   SUBROUTINE h5tbwrite_field_index_f_c_long_double(loc_id,&
        dset_name,&
        field_index,&
@@ -931,7 +931,7 @@ CONTAINS
 
   END SUBROUTINE h5tbread_field_index_f_c_double
 
-#ifdef H5_FORTRAN_HAVE_C_LONG_DOUBLE
+#if FORTRAN_C_LONG_DOUBLE_IS_UNIQUE!=0
   SUBROUTINE h5tbread_field_index_f_c_long_double(loc_id,&
        dset_name,&
        field_index,&
@@ -1093,7 +1093,7 @@ CONTAINS
     
   END SUBROUTINE h5tbinsert_field_f_c_double
 
-#ifdef H5_FORTRAN_HAVE_C_LONG_DOUBLE
+#if FORTRAN_C_LONG_DOUBLE_IS_UNIQUE!=0
   SUBROUTINE h5tbinsert_field_f_c_long_double(loc_id,&
        dset_name,&
        field_name,&
diff --git a/hl/fortran/src/Makefile.in b/hl/fortran/src/Makefile.in
index 35886b6..66cf45d 100644
--- a/hl/fortran/src/Makefile.in
+++ b/hl/fortran/src/Makefile.in
@@ -478,6 +478,7 @@ FCFLAGS_f90 = @FCFLAGS_f90@
 FCLIBS = @FCLIBS@
 FC_VERSION = @FC_VERSION@
 FGREP = @FGREP@
+FORTRAN_C_LONG_DOUBLE_IS_UNIQUE = @FORTRAN_C_LONG_DOUBLE_IS_UNIQUE@
 FORTRAN_HAVE_C_LONG_DOUBLE = @FORTRAN_HAVE_C_LONG_DOUBLE@
 FSEARCH_DIRS = @FSEARCH_DIRS@
 GREP = @GREP@
diff --git a/hl/fortran/test/Makefile.in b/hl/fortran/test/Makefile.in
index 6389d6b..1b6ff38 100644
--- a/hl/fortran/test/Makefile.in
+++ b/hl/fortran/test/Makefile.in
@@ -469,6 +469,7 @@ FCFLAGS_f90 = @FCFLAGS_f90@
 FCLIBS = @FCLIBS@
 FC_VERSION = @FC_VERSION@
 FGREP = @FGREP@
+FORTRAN_C_LONG_DOUBLE_IS_UNIQUE = @FORTRAN_C_LONG_DOUBLE_IS_UNIQUE@
 FORTRAN_HAVE_C_LONG_DOUBLE = @FORTRAN_HAVE_C_LONG_DOUBLE@
 FSEARCH_DIRS = @FSEARCH_DIRS@
 GREP = @GREP@
diff --git a/hl/fortran/test/tstlite.F90 b/hl/fortran/test/tstlite.F90
index 26e9467..4c1ca14 100644
--- a/hl/fortran/test/tstlite.F90
+++ b/hl/fortran/test/tstlite.F90
@@ -1214,17 +1214,18 @@ SUBROUTINE test_datasets()
   !
   ! write dataset.
   !
-  f_ptr = C_LOC(buf4(1))
-  CALL h5ltmake_dataset_f(file_id, dsetname4, rank, dims, H5T_NATIVE_DOUBLE, f_ptr, errcode)
-  !CALL h5ltmake_dataset_double_f(file_id, dsetname4, rank, dims, buf4, errcode)
+  !f_ptr = C_LOC(buf4(1))
+  !CALL h5ltmake_dataset_f(file_id, dsetname4, rank, dims, H5T_NATIVE_DOUBLE, f_ptr, errcode)
+  CALL h5ltmake_dataset_double_f(file_id, dsetname4, rank, dims, buf4, errcode)
 
   !
   ! read dataset.
   !
-  !!!f_ptr = C_LOC(buf4(1)) MSB
-  !!!CALL h5ltread_dataset_f(file_id, dsetname4, H5T_NATIVE_DOUBLE, f_ptr, errcode) MSB
+  !f_ptr = C_LOC(buf4(1))
+  !CALL h5ltread_dataset_f(file_id, dsetname4, H5T_NATIVE_DOUBLE, f_ptr, errcode)
   CALL h5ltread_dataset_double_f(file_id, dsetname4, bufr4, dims, errcode)
 
+
   !
   ! compare read and write buffers.
   !