From d368ecf7e80e37e69b6ccf62685e9c1299fdb483 Mon Sep 17 00:00:00 2001 From: Quincey Koziol Date: Mon, 10 Jan 2005 17:56:20 -0500 Subject: [svn-r9801] Purpose: Bug fix Description: Belatedly chase change of hobj_ref_t in C APIs. Platforms tested: FreeBSD 4.10 (sleipnir) w/backward compatibility turned on IRIX64 6.5 (modi4) w/FORTRAN h5committest --- fortran/config/dec-flags | 1 + fortran/config/hpux10.20 | 1 + fortran/config/hpux11.00 | 1 + fortran/config/ia64-linux-gnu | 2 ++ fortran/config/irix6.x | 1 + fortran/config/linux-gnulibc1 | 1 + fortran/config/powerpc-apple | 1 + fortran/config/powerpc-ibm-aix4.x | 1 + fortran/config/powerpc-ibm-aix5.x | 1 + fortran/config/solaris2.x | 1 + fortran/config/sv1-cray | 1 + fortran/config/unicos | 1 + fortran/config/unicos10.0.X | 1 + fortran/config/unicosmk | 1 + fortran/config/unicosmk2.0.5.X | 1 + fortran/config/unicosmk2.0.6.X | 1 + fortran/config/unicosmk2.0.X | 1 + fortran/configure | 10 ++++++---- fortran/configure.in | 1 + 19 files changed, 25 insertions(+), 4 deletions(-) diff --git a/fortran/config/dec-flags b/fortran/config/dec-flags index c5ecc43..703b648 100644 --- a/fortran/config/dec-flags +++ b/fortran/config/dec-flags @@ -73,6 +73,7 @@ fi # R_LARGE=18 R_INTEGER=9 +HADDR_T='SELECTED_INT_KIND(R_LARGE)' HSIZE_T='SELECTED_INT_KIND(R_LARGE)' HSSIZE_T='SELECTED_INT_KIND(R_LARGE)' HID_T='SELECTED_INT_KIND(R_INTEGER)' diff --git a/fortran/config/hpux10.20 b/fortran/config/hpux10.20 index 823e2b1..388342a 100644 --- a/fortran/config/hpux10.20 +++ b/fortran/config/hpux10.20 @@ -47,6 +47,7 @@ esac # R_LARGE=18 R_INTEGER=9 +HADDR_T='SELECTED_INT_KIND(R_LARGE)' HSIZE_T='SELECTED_INT_KIND(R_LARGE)' HSSIZE_T='SELECTED_INT_KIND(R_LARGE)' HID_T='SELECTED_INT_KIND(R_INTEGER)' diff --git a/fortran/config/hpux11.00 b/fortran/config/hpux11.00 index 823e2b1..388342a 100644 --- a/fortran/config/hpux11.00 +++ b/fortran/config/hpux11.00 @@ -47,6 +47,7 @@ esac # R_LARGE=18 R_INTEGER=9 +HADDR_T='SELECTED_INT_KIND(R_LARGE)' HSIZE_T='SELECTED_INT_KIND(R_LARGE)' HSSIZE_T='SELECTED_INT_KIND(R_LARGE)' HID_T='SELECTED_INT_KIND(R_INTEGER)' diff --git a/fortran/config/ia64-linux-gnu b/fortran/config/ia64-linux-gnu index 94a6824..f79b391 100644 --- a/fortran/config/ia64-linux-gnu +++ b/fortran/config/ia64-linux-gnu @@ -58,6 +58,7 @@ case $F9X in # -Vaxlib is for non-standard fortran calls like exit(). MORE_FFLAGS='-fpp -DDEC$=DEC_ -DMS$=MS_ -Vaxlib' FFLAGS="$FFLAGS $MORE_FFLAGS" + HADDR_T='SELECTED_INT_KIND(R_LARGE)' HSIZE_T='SELECTED_INT_KIND(R_LARGE)' HSSIZE_T='SELECTED_INT_KIND(R_LARGE)' HID_T='SELECTED_INT_KIND(R_INTEGER)' @@ -66,6 +67,7 @@ case $F9X in f9x_flags_set=yes ;; *) + HADDR_T='SELECTED_INT_KIND(R_LARGE)' HSIZE_T='SELECTED_INT_KIND(R_LARGE)' HSSIZE_T='SELECTED_INT_KIND(R_LARGE)' HID_T='SELECTED_INT_KIND(R_INTEGER)' diff --git a/fortran/config/irix6.x b/fortran/config/irix6.x index 8e7dd3e..9f1acef 100644 --- a/fortran/config/irix6.x +++ b/fortran/config/irix6.x @@ -106,6 +106,7 @@ fi # R_LARGE=18 R_INTEGER=9 +HADDR_T='SELECTED_INT_KIND(R_LARGE)' HSIZE_T='SELECTED_INT_KIND(R_LARGE)' HSSIZE_T='SELECTED_INT_KIND(R_LARGE)' HID_T='SELECTED_INT_KIND(R_INTEGER)' diff --git a/fortran/config/linux-gnulibc1 b/fortran/config/linux-gnulibc1 index bbd2735..83bbc88 100644 --- a/fortran/config/linux-gnulibc1 +++ b/fortran/config/linux-gnulibc1 @@ -72,6 +72,7 @@ fi # R_LARGE=18 R_INTEGER=9 +HADDR_T='SELECTED_INT_KIND(R_LARGE)' HSIZE_T='SELECTED_INT_KIND(R_LARGE)' HSSIZE_T='SELECTED_INT_KIND(R_LARGE)' HID_T='SELECTED_INT_KIND(R_INTEGER)' diff --git a/fortran/config/powerpc-apple b/fortran/config/powerpc-apple index 13f288a..50c4b27 100644 --- a/fortran/config/powerpc-apple +++ b/fortran/config/powerpc-apple @@ -33,6 +33,7 @@ fi # R_LARGE=18 R_INTEGER=9 +HADDR_T='SELECTED_INT_KIND(R_LARGE)' HSIZE_T='SELECTED_INT_KIND(R_LARGE)' HSSIZE_T='SELECTED_INT_KIND(R_LARGE)' HID_T='SELECTED_INT_KIND(R_INTEGER)' diff --git a/fortran/config/powerpc-ibm-aix4.x b/fortran/config/powerpc-ibm-aix4.x index 01b252d..73c622d 100644 --- a/fortran/config/powerpc-ibm-aix4.x +++ b/fortran/config/powerpc-ibm-aix4.x @@ -23,6 +23,7 @@ hdf5_cv_printf_ll=${hdf5_cv_printf_ll='ll'} # R_LARGE=18 R_INTEGER=9 +HADDR_T='SELECTED_INT_KIND(R_LARGE)' HSIZE_T='SELECTED_INT_KIND(R_LARGE)' HSSIZE_T='SELECTED_INT_KIND(R_LARGE)' HID_T='SELECTED_INT_KIND(R_INTEGER)' diff --git a/fortran/config/powerpc-ibm-aix5.x b/fortran/config/powerpc-ibm-aix5.x index 80ea78c..f463491 100644 --- a/fortran/config/powerpc-ibm-aix5.x +++ b/fortran/config/powerpc-ibm-aix5.x @@ -71,6 +71,7 @@ esac # R_LARGE=18 R_INTEGER=9 +HADDR_T='SELECTED_INT_KIND(R_LARGE)' HSIZE_T='SELECTED_INT_KIND(R_LARGE)' HSSIZE_T='SELECTED_INT_KIND(R_LARGE)' HID_T='SELECTED_INT_KIND(R_INTEGER)' diff --git a/fortran/config/solaris2.x b/fortran/config/solaris2.x index 9c30c71..48003e0 100644 --- a/fortran/config/solaris2.x +++ b/fortran/config/solaris2.x @@ -43,6 +43,7 @@ fi # R_LARGE=18 R_INTEGER=9 +HADDR_T='SELECTED_INT_KIND(R_LARGE)' HSIZE_T='SELECTED_INT_KIND(R_LARGE)' HSSIZE_T='SELECTED_INT_KIND(R_LARGE)' HID_T='SELECTED_INT_KIND(R_INTEGER)' diff --git a/fortran/config/sv1-cray b/fortran/config/sv1-cray index 02ae604..c046c6e 100644 --- a/fortran/config/sv1-cray +++ b/fortran/config/sv1-cray @@ -149,6 +149,7 @@ esac # R_LARGE=18 R_INTEGER=18 +HADDR_T='SELECTED_INT_KIND(R_LARGE)' HSIZE_T='SELECTED_INT_KIND(R_LARGE)' HSSIZE_T='SELECTED_INT_KIND(R_LARGE)' HID_T='SELECTED_INT_KIND(R_INTEGER)' diff --git a/fortran/config/unicos b/fortran/config/unicos index 1858c9a..328616b 100644 --- a/fortran/config/unicos +++ b/fortran/config/unicos @@ -147,6 +147,7 @@ ac_cv_c_bigendian=${ac_cv_c_bigendian='yes'} # R_LARGE=18 R_INTEGER=18 +HADDR_T='SELECTED_INT_KIND(R_LARGE)' HSIZE_T='SELECTED_INT_KIND(R_LARGE)' HSSIZE_T='SELECTED_INT_KIND(R_LARGE)' HID_T='SELECTED_INT_KIND(R_INTEGER)' diff --git a/fortran/config/unicos10.0.X b/fortran/config/unicos10.0.X index 1858c9a..328616b 100644 --- a/fortran/config/unicos10.0.X +++ b/fortran/config/unicos10.0.X @@ -147,6 +147,7 @@ ac_cv_c_bigendian=${ac_cv_c_bigendian='yes'} # R_LARGE=18 R_INTEGER=18 +HADDR_T='SELECTED_INT_KIND(R_LARGE)' HSIZE_T='SELECTED_INT_KIND(R_LARGE)' HSSIZE_T='SELECTED_INT_KIND(R_LARGE)' HID_T='SELECTED_INT_KIND(R_INTEGER)' diff --git a/fortran/config/unicosmk b/fortran/config/unicosmk index 02ae604..c046c6e 100644 --- a/fortran/config/unicosmk +++ b/fortran/config/unicosmk @@ -149,6 +149,7 @@ esac # R_LARGE=18 R_INTEGER=18 +HADDR_T='SELECTED_INT_KIND(R_LARGE)' HSIZE_T='SELECTED_INT_KIND(R_LARGE)' HSSIZE_T='SELECTED_INT_KIND(R_LARGE)' HID_T='SELECTED_INT_KIND(R_INTEGER)' diff --git a/fortran/config/unicosmk2.0.5.X b/fortran/config/unicosmk2.0.5.X index 61d82d3..d360c13 100644 --- a/fortran/config/unicosmk2.0.5.X +++ b/fortran/config/unicosmk2.0.5.X @@ -149,6 +149,7 @@ esac # R_LARGE=18 R_INTEGER=18 +HADDR_T='SELECTED_INT_KIND(R_LARGE)' HSIZE_T='SELECTED_INT_KIND(R_LARGE)' HSSIZE_T='SELECTED_INT_KIND(R_LARGE)' HID_T='SELECTED_INT_KIND(R_INTEGER)' diff --git a/fortran/config/unicosmk2.0.6.X b/fortran/config/unicosmk2.0.6.X index b228242..bbf29b6 100644 --- a/fortran/config/unicosmk2.0.6.X +++ b/fortran/config/unicosmk2.0.6.X @@ -149,6 +149,7 @@ esac # R_LARGE=18 R_INTEGER=18 +HADDR_T='SELECTED_INT_KIND(R_LARGE)' HSIZE_T='SELECTED_INT_KIND(R_LARGE)' HSSIZE_T='SELECTED_INT_KIND(R_LARGE)' HID_T='SELECTED_INT_KIND(R_INTEGER)' diff --git a/fortran/config/unicosmk2.0.X b/fortran/config/unicosmk2.0.X index 61d82d3..d360c13 100644 --- a/fortran/config/unicosmk2.0.X +++ b/fortran/config/unicosmk2.0.X @@ -149,6 +149,7 @@ esac # R_LARGE=18 R_INTEGER=18 +HADDR_T='SELECTED_INT_KIND(R_LARGE)' HSIZE_T='SELECTED_INT_KIND(R_LARGE)' HSSIZE_T='SELECTED_INT_KIND(R_LARGE)' HID_T='SELECTED_INT_KIND(R_INTEGER)' diff --git a/fortran/configure b/fortran/configure index 6575531..26d4d7a 100755 --- a/fortran/configure +++ b/fortran/configure @@ -1485,6 +1485,7 @@ host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` + echo "$as_me:$LINENO: checking shell variables initial values" >&5 echo $ECHO_N "checking shell variables initial values... $ECHO_C" >&6 set >&5 @@ -3896,7 +3897,7 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes case $host in *-*-irix6*) # Find out which ABI we are using. - echo '#line 3899 "configure"' > conftest.$ac_ext + echo '#line 3900 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -4437,7 +4438,7 @@ chmod -w . save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -o out/conftest2.$ac_objext" compiler_c_o=no -if { (eval echo configure:4440: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then +if { (eval echo configure:4441: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings if test -s out/conftest.err; then @@ -6248,7 +6249,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <