From e26b78a04b855a1c5c60dbe161ac1fd4c2123405 Mon Sep 17 00:00:00 2001
From: Scot Breitenfeld <brtnfld@hdfgroup.org>
Date: Thu, 3 Apr 2014 10:18:42 -0500
Subject: [svn-r24953] Fixed --enable-production compilation error using Sun
 compilers.

Tested (emu)
---
 fortran/test/fortranlib_test.f90 | 4 ++--
 fortran/test/tH5P_F03.f90        | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/fortran/test/fortranlib_test.f90 b/fortran/test/fortranlib_test.f90
index ff9f899..6268d15 100644
--- a/fortran/test/fortranlib_test.f90
+++ b/fortran/test/fortranlib_test.f90
@@ -72,10 +72,10 @@ PROGRAM fortranlibtest
   CALL reopentest(cleanup, ret_total_error)
   CALL write_test_status(ret_total_error, ' Reopen test', total_error)
 
-  ret_total_error = 0
 !DEC$ if defined(H5_VMS)
   GOTO 8
 !DEC$ else
+  ret_total_error = 0
   CALL file_close(cleanup, ret_total_error)
   CALL write_test_status(ret_total_error, ' File open/close test', total_error)
 !DEC$ endif
@@ -179,10 +179,10 @@ PROGRAM fortranlibtest
   CALL external_test(cleanup, ret_total_error)
   CALL write_test_status(ret_total_error, ' External dataset test', total_error)
 
-  ret_total_error = 0
 !DEC$ if defined(H5_VMS)
   GOTO 9
 !DEC$ else
+  ret_total_error = 0
   CALL multi_file_test(cleanup, ret_total_error)
   CALL write_test_status(ret_total_error, ' Multi file driver test', total_error)
 !DEC$ endif
diff --git a/fortran/test/tH5P_F03.f90 b/fortran/test/tH5P_F03.f90
index 5d6b1b9..398fb87 100644
--- a/fortran/test/tH5P_F03.f90
+++ b/fortran/test/tH5P_F03.f90
@@ -379,7 +379,7 @@ END SUBROUTINE test_genprop_class_callback
 SUBROUTINE test_h5p_file_image(total_error)
 
   USE HDF5
-  USE ISO_C_BINDING
+  USE, INTRINSIC :: iso_c_binding
   IMPLICIT NONE
   INTEGER, INTENT(INOUT) :: total_error
   INTEGER(hid_t) ::   fapl_1 = -1
@@ -404,7 +404,7 @@ SUBROUTINE test_h5p_file_image(total_error)
   CALL check("h5pcreate_f", error, total_error)
 
   ! Test with NULL ptr
-  f_ptr2 = C_NULL_PTR
+  f_ptr2(1) = C_NULL_PTR
   temp_size = 1
   CALL h5pget_file_image_f(fapl_1, f_ptr2, temp_size, error)
   CALL check("h5pget_file_image_f", error, total_error)
-- 
cgit v0.12