summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobb Matzke <matzke@llnl.gov>1999-02-26 19:58:14 (GMT)
committerRobb Matzke <matzke@llnl.gov>1999-02-26 19:58:14 (GMT)
commit912c5a0874182f0705e3fe6756859817e2a64cdd (patch)
treea68f01992ce5a618dfee8f69778e2ffd8dda03af
parentefb18f8785f0c1f967743fba1ed13a392a0ca601 (diff)
downloadhdf5-912c5a0874182f0705e3fe6756859817e2a64cdd.zip
hdf5-912c5a0874182f0705e3fe6756859817e2a64cdd.tar.gz
hdf5-912c5a0874182f0705e3fe6756859817e2a64cdd.tar.bz2
[svn-r1108] Changes since 19990225
---------------------- ./INSTALL Added warnings and a disclaimer about GNU, DEC, Irix64, and NT compilers that generate incorrect machine code. ./configure.in ./src/H5private.h Detects and includes <sys/param.h> which is needed on FreeBSD before <sys/proc.h> even though we only really using anything from <sys/proc.h> on the DEC Alpha. ./config/irix64 Turned off warnings for duplicate definitions from the linker because -lnsl on irix has the same stuff in it as -lc. ./config/irix6.x Split up the CC and CFLAGS settings like with irix64 so that compilers besides `-n32' can be used. ./bin/snapshot The snapshots are tagged with names like hdf5-1_1_52 which is similar to the way the releases are tagged (cvs doesn't allow dots in tags). ./test/dtypes.c ./src/H5private.h ./src/H5Tconv.c Fixed some alignment violations on the DEC when using high optimization levels. The DEC incorrectly optimizes certain memcpy() and memmove() calls when the source argument is not word aligned if the call looks like it's copying an atomic data type. ./test/hyperslab Worked around code generation bugs in the Irix64 Mongoose 7.00 compiler by casting some `unsigned long' values to `unsigned' in an expression. ./src/H5Ocomp.c Fixed a place where %d was used to print a size_t.
Diffstat
-rw-r--r--INSTALL36
-rw-r--r--README2
-rwxr-xr-xbin/snapshot3
-rw-r--r--config/irix6.x16
-rw-r--r--config/irix644
-rwxr-xr-xconfigure679
-rw-r--r--configure.in4
-rw-r--r--src/.distdep572
-rw-r--r--src/H5Ocomp.c2
-rw-r--r--src/H5Tconv.c12
-rw-r--r--src/H5config.h.in12
-rw-r--r--src/H5detect.c16
-rw-r--r--src/H5private.h25
-rw-r--r--test/.distdep444
-rw-r--r--test/dtypes.c553
-rw-r--r--test/hyperslab.c45
16 files changed, 1298 insertions, 1127 deletions
diff --git a/INSTALL b/INSTALL
index 4005e20..633150e 100644
--- a/INSTALL
+++ b/INSTALL
@@ -18,9 +18,39 @@ can do the following:
$ make install # Optional
-Note:
-For the users of the Intel TFLOPS machine, a special sequence of steps
-for the install may be found in the file: INSTALL.ascired.
+Note: For the users of the Intel TFLOPS machine, a special sequence of
+steps for the install may be found in the file: INSTALL.ascired.
+
+OUTPUT FROM THE FOLLOWING COMPILERS SHOULD BE EXTREMELY SUSPECT WHEN
+USED TO COMPILE THE HDF5 LIBRARY, ESPECIALLY IF OPTIMIZATIONS ARE
+ENABLED. IN ALL CASES, HDF5 ATTEMPTS TO WORK AROUND THE COMPILER BUGS
+BUT THE HDF5 DEVELOPMENT TEAM MAKES NO GUARANTEES THAT THERE ARE OTHER
+CODE GENERATION PROBLEMS.
+
+ * GNU (Intel platforms)
+ Versions before 2.8.1 have serious problems allocating
+ registers when functions contain operations on `long long'
+ data types. Supplying the `--disable-hsizet' switch to
+ configure (documented below) will prevent hdf5 from using
+ `long long' data types in situations that are known not to
+ work, but it limits the hdf5 address space to 2GB.
+
+ * DEC
+ The V5.2-038 compiler (and possibly others) occasionally
+ generates incorrect code for memcpy() calls when optimizations
+ are enabled, resulting in unaligned access faults. HDF5 works
+ around the problem by casting the second argument to `char*'.
+
+ * SGI (Irix64 6.2)
+ The Mongoose 7.00 compiler has serious optimization bugs and
+ should be upgraded to MIPSpro 7.2.1.2m. Patches are available
+ from SGI.
+
+ * Windows/NT
+ The MicroSoft Win32 5.0 compiler is unable to cast unsigned
+ long long values to doubles. HDF5 works around this bug by
+ first casting to signed long long and then to double.
+
=======
Step 0: Install optional third-party packages.
diff --git a/README b/README
index 06ef459b..43a5e8d 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-This is hdf5-1.1.52 released on Fri Feb 26 04:18:35 CST 1999
+This is hdf5-1.1.53 released on Fri Feb 26 09:31:50 CST 1999
Please refer to the INSTALL file for installation instructions.
------------------------------------------------------------------------------
diff --git a/bin/snapshot b/bin/snapshot
index c83e209..e7c5c85 100755
--- a/bin/snapshot
+++ b/bin/snapshot
@@ -71,10 +71,11 @@ if [ "$snapshot" = "yes" ]; then
(cd ${COMPARE}/current; make distclean)
fi
-# Release snapshot, update version, and commit to cvs
+# Release snapshot, update version, and commit to cvs and tag
if [ "$snapshot" = "yes" ]; then
(
cd ${COMPARE}/current
+ cvs -Q tag hdf5-`./bin/h5vers |tr . _`
./bin/release -d $ARCHIVES $METHODS
./bin/h5vers -i
cvs -Q commit -m Snapshot
diff --git a/config/irix6.x b/config/irix6.x
index 4ba1252..ed16b69 100644
--- a/config/irix6.x
+++ b/config/irix6.x
@@ -8,7 +8,7 @@
# The default compiler is `cc' and there is no ranlib.
if test "X-" = "X-$CC"; then
- CC=cc
+ CC='cc -n32'
CC_BASENAME=cc
fi
RANLIB=:
@@ -25,22 +25,32 @@ case "X-$CC_BASENAME" in
;;
*)
+ CFLAGS="$CFLAGS -ansi"
+
# Always turn off these compiler warnings:
# 1174: function declared but not used
# 1429: the `long long' type is not standard
# 1209: constant expressions
# 1196: __vfork() (this is an SGI config problem)
+ CFLAGS="$CFLAGS -woff 1174,1429,1209,1196"
+
# Always turn off these loader warnings:
# 47: linked module might degrade performance
# 84: a library is not used
# 85: duplicate definition preemption
# 134: duplicate weak definition preemption
- CFLAGS="$CFLAGS -ansi -n32 -woff 1174,1429,1209,1196 -Wl,-woff,47 -Wl,-woff,84 -Wl,-woff,85 -Wl,-woff,134"
+ CFLAGS="$CFLAGS -Wl,-woff,47,-woff,84,-woff,85,-woff,134"
+
+ # Extra debugging flags
DEBUG_CFLAGS=-g
DEBUG_CPPFLAGS=
- # Higher optimizations relax alignment requirements needed
+
+ # Extra production flags
+ # Note: higher optimizations relax alignment requirements needed.
PROD_CFLAGS=-O1
PROD_CPPFLAGS=
+
+ # Extra profiling flags
PROFILE_CFLAGS=-pg
PROFILE_CPPFLAGS=
;;
diff --git a/config/irix64 b/config/irix64
index 2a4d782..1c17c7c 100644
--- a/config/irix64
+++ b/config/irix64
@@ -46,7 +46,9 @@ case "X-$CC_BASENAME" in
# (notice the peculiar syntax)
# 47: branch instructions that degrade performance on R4000
# 84: a library is not used
- CFLAGS="$CFLAGS -Wl,-woff,47 -Wl,-woff,84"
+ # 85: duplicate definition preemption (from -lnsl)
+ # 134: duplicate weak definition preemption (from -lnsl)
+ CFLAGS="$CFLAGS -Wl,-woff,47,-woff,84,-woff,85,-woff,134"
# Extra debugging flags
DEBUG_CFLAGS="-g -fullwarn"
diff --git a/configure b/configure
index 02eb0ee..bcdff1a 100755
--- a/configure
+++ b/configure
@@ -2,7 +2,7 @@
# From configure.in Id: configure.in
# Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.12
+# Generated automatically using autoconf version 2.13
# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
#
# This configure script is free software; the Free Software Foundation
@@ -72,6 +72,7 @@ mandir='${prefix}/man'
# Initialize some other variables.
subdirs=
MFLAGS= MAKEFLAGS=
+SHELL=${CONFIG_SHELL-/bin/sh}
# Maximum number of lines to put in a shell here document.
ac_max_here_lines=12
@@ -355,7 +356,7 @@ EOF
verbose=yes ;;
-version | --version | --versio | --versi | --vers)
- echo "configure generated by autoconf version 2.12"
+ echo "configure generated by autoconf version 2.13"
exit 0 ;;
-with-* | --with-*)
@@ -525,9 +526,11 @@ ac_ext=c
# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
ac_cpp='$CPP $CPPFLAGS'
ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
cross_compiling=$ac_cv_prog_cc_cross
+ac_exeext=
+ac_objext=o
if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
# Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
@@ -563,26 +566,26 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
# Make sure we can run config.sub.
-if $ac_config_sub sun4 >/dev/null 2>&1; then :
+if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
fi
echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:572: checking host system type" >&5
+echo "configure:575: checking host system type" >&5
host_alias=$host
case "$host_alias" in
NONE)
case $nonopt in
NONE)
- if host_alias=`$ac_config_guess`; then :
+ if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
fi ;;
*) host_alias=$nonopt ;;
esac ;;
esac
-host=`$ac_config_sub $host_alias`
+host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
@@ -591,12 +594,12 @@ echo "$ac_t""$host" 1>&6
echo $ac_n "checking shell variables initial values""... $ac_c" 1>&6
-echo "configure:595: checking shell variables initial values" >&5
+echo "configure:598: checking shell variables initial values" >&5
set >&5
echo "$ac_t""done" 1>&6
echo $ac_n "checking for cached host""... $ac_c" 1>&6
-echo "configure:600: checking for cached host" >&5
+echo "configure:603: checking for cached host" >&5
if eval "test \"`echo '$''{'hdf5_cv_host'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -614,7 +617,7 @@ fi
echo $ac_n "checking for host config file""... $ac_c" 1>&6
-echo "configure:618: checking for host config file" >&5
+echo "configure:621: checking for host config file" >&5
host_config="none"
for f in $host \
$host_vendor-$host_os \
@@ -637,15 +640,16 @@ fi
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:641: checking for $ac_word" >&5
+echo "configure:644: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
else
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
- for ac_dir in $PATH; do
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
+ ac_dummy="$PATH"
+ for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
if test -f $ac_dir/$ac_word; then
ac_cv_prog_CC="gcc"
@@ -666,16 +670,17 @@ if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:670: checking for $ac_word" >&5
+echo "configure:674: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
else
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
ac_prog_rejected=no
- for ac_dir in $PATH; do
+ ac_dummy="$PATH"
+ for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
if test -f $ac_dir/$ac_word; then
if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
@@ -710,25 +715,61 @@ else
echo "$ac_t""no" 1>&6
fi
+ if test -z "$CC"; then
+ case "`uname -s`" in
+ *win32* | *WIN32*)
+ # Extract the first word of "cl", so it can be a program name with args.
+set dummy cl; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:725: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
+ ac_dummy="$PATH"
+ for ac_dir in $ac_dummy; do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f $ac_dir/$ac_word; then
+ ac_cv_prog_CC="cl"
+ break
+ fi
+ done
+ IFS="$ac_save_ifs"
+fi
+fi
+CC="$ac_cv_prog_CC"
+if test -n "$CC"; then
+ echo "$ac_t""$CC" 1>&6
+else
+ echo "$ac_t""no" 1>&6
+fi
+ ;;
+ esac
+ fi
test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:718: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:757: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
ac_ext=c
# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
ac_cpp='$CPP $CPPFLAGS'
ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
cross_compiling=$ac_cv_prog_cc_cross
-cat > conftest.$ac_ext <<EOF
-#line 728 "configure"
+cat > conftest.$ac_ext << EOF
+
+#line 768 "configure"
#include "confdefs.h"
+
main(){return(0);}
EOF
-if { (eval echo configure:732: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:773: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
ac_cv_prog_cc_works=yes
# If we can't run a trivial program, we are probably using a cross compiler.
if (./conftest; exit) 2>/dev/null; then
@@ -742,18 +783,24 @@ else
ac_cv_prog_cc_works=no
fi
rm -fr conftest*
+ac_ext=c
+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
if test $ac_cv_prog_cc_works = no; then
{ echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:752: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:799: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
cross_compiling=$ac_cv_prog_cc_cross
echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:757: checking whether we are using GNU C" >&5
+echo "configure:804: checking whether we are using GNU C" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -762,7 +809,7 @@ else
yes;
#endif
EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:766: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:813: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gcc=yes
else
ac_cv_prog_gcc=no
@@ -773,11 +820,15 @@ echo "$ac_t""$ac_cv_prog_gcc" 1>&6
if test $ac_cv_prog_gcc = yes; then
GCC=yes
- ac_test_CFLAGS="${CFLAGS+set}"
- ac_save_CFLAGS="$CFLAGS"
- CFLAGS=
- echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:781: checking whether ${CC-cc} accepts -g" >&5
+else
+ GCC=
+fi
+
+ac_test_CFLAGS="${CFLAGS+set}"
+ac_save_CFLAGS="$CFLAGS"
+CFLAGS=
+echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
+echo "configure:832: checking whether ${CC-cc} accepts -g" >&5
if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -792,21 +843,25 @@ rm -f conftest*
fi
echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
- if test "$ac_test_CFLAGS" = set; then
- CFLAGS="$ac_save_CFLAGS"
- elif test $ac_cv_prog_cc_g = yes; then
+if test "$ac_test_CFLAGS" = set; then
+ CFLAGS="$ac_save_CFLAGS"
+elif test $ac_cv_prog_cc_g = yes; then
+ if test "$GCC" = yes; then
CFLAGS="-g -O2"
else
- CFLAGS="-O2"
+ CFLAGS="-g"
fi
else
- GCC=
- test "${CFLAGS+set}" = set || CFLAGS="-g"
+ if test "$GCC" = yes; then
+ CFLAGS="-O2"
+ else
+ CFLAGS=
+ fi
fi
CC_BASENAME="`echo $CC |cut -f1 -d' ' |xargs basename 2>/dev/null`"
echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:810: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:865: checking whether ${MAKE-make} sets \${MAKE}" >&5
set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -839,28 +894,30 @@ fi
# SunOS /usr/etc/install
# IRIX /sbin/install
# AIX /bin/install
+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
# AFS /usr/afsws/bin/install, which mishandles nonexistent args
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# ./install, which can be erroneously created by make from ./install.sh.
echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:847: checking for a BSD compatible install" >&5
+echo "configure:903: checking for a BSD compatible install" >&5
if test -z "$INSTALL"; then
if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
- IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS="${IFS}:"
+ IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":"
for ac_dir in $PATH; do
# Account for people who put trailing slashes in PATH elements.
case "$ac_dir/" in
/|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
*)
# OSF1 and SCO ODT 3.0 have their own names for install.
- for ac_prog in ginstall installbsd scoinst install; do
+ # Don't use installbsd from OSF since it installs stuff as root
+ # by default.
+ for ac_prog in ginstall scoinst install; do
if test -f $ac_dir/$ac_prog; then
if test $ac_prog = install &&
grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
# AIX install. It has an incompatible calling convention.
- # OSF/1 installbsd also uses dspmsg, but is usable.
:
else
ac_cv_path_install="$ac_dir/$ac_prog -c"
@@ -890,20 +947,23 @@ echo "$ac_t""$INSTALL" 1>&6
# It thinks the first close brace ends the variable substitution.
test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
+
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
# Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:899: checking for $ac_word" >&5
+echo "configure:958: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
if test -n "$RANLIB"; then
ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
else
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
- for ac_dir in $PATH; do
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
+ ac_dummy="$PATH"
+ for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
if test -f $ac_dir/$ac_word; then
ac_cv_prog_RANLIB="ranlib"
@@ -928,15 +988,16 @@ do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:932: checking for $ac_word" >&5
+echo "configure:992: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
if test -n "$AR"; then
ac_cv_prog_AR="$AR" # Let the user override the test.
else
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
- for ac_dir in $PATH$ac_dummy; do
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
+ ac_dummy="$PATH"
+ for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
if test -f $ac_dir/$ac_word; then
ac_cv_prog_AR="$ac_prog"
@@ -961,7 +1022,7 @@ fi
echo $ac_n "checking for GNU Make""... $ac_c" 1>&6
-echo "configure:965: checking for GNU Make" >&5
+echo "configure:1026: checking for GNU Make" >&5
if test "`${MAKE-make} --version -f /dev/null 2>/dev/null |\
sed -n 1p|cut -c1-8`" = "GNU Make"; then
echo "$ac_t""yes" 1>&6
@@ -975,7 +1036,7 @@ if test Xyes = "X$GCC"; then
fi
echo $ac_n "checking for production mode""... $ac_c" 1>&6
-echo "configure:979: checking for production mode" >&5
+echo "configure:1040: checking for production mode" >&5
# Check whether --enable-production or --disable-production was given.
if test "${enable_production+set}" = set; then
enableval="$enable_production"
@@ -1005,7 +1066,7 @@ case "X-$enableval" in
esac
echo $ac_n "checking for ceil in -lm""... $ac_c" 1>&6
-echo "configure:1009: checking for ceil in -lm" >&5
+echo "configure:1070: checking for ceil in -lm" >&5
ac_lib_var=`echo m'_'ceil | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -1013,7 +1074,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lm $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1017 "configure"
+#line 1078 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -1024,7 +1085,7 @@ int main() {
ceil()
; return 0; }
EOF
-if { (eval echo configure:1028: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1089: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -1052,7 +1113,7 @@ else
fi
echo $ac_n "checking for xdr_int in -lnsl""... $ac_c" 1>&6
-echo "configure:1056: checking for xdr_int in -lnsl" >&5
+echo "configure:1117: checking for xdr_int in -lnsl" >&5
ac_lib_var=`echo nsl'_'xdr_int | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -1060,7 +1121,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lnsl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1064 "configure"
+#line 1125 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -1071,7 +1132,7 @@ int main() {
xdr_int()
; return 0; }
EOF
-if { (eval echo configure:1075: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1136: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -1098,7 +1159,7 @@ else
echo "$ac_t""no" 1>&6
fi
echo $ac_n "checking for main in -lcoug""... $ac_c" 1>&6
-echo "configure:1102: checking for main in -lcoug" >&5
+echo "configure:1163: checking for main in -lcoug" >&5
ac_lib_var=`echo coug'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -1106,14 +1167,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lcoug $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1110 "configure"
+#line 1171 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:1117: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1178: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -1140,7 +1201,7 @@ else
echo "$ac_t""no" 1>&6
fi
echo $ac_n "checking for main in -ljpeg""... $ac_c" 1>&6
-echo "configure:1144: checking for main in -ljpeg" >&5
+echo "configure:1205: checking for main in -ljpeg" >&5
ac_lib_var=`echo jpeg'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -1148,14 +1209,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-ljpeg $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1152 "configure"
+#line 1213 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:1159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1220: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -1183,7 +1244,7 @@ else
fi
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1187: checking how to run the C preprocessor" >&5
+echo "configure:1248: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
@@ -1198,14 +1259,14 @@ else
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp.
cat > conftest.$ac_ext <<EOF
-#line 1202 "configure"
+#line 1263 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1208: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
+{ (eval echo configure:1269: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
else
@@ -1215,14 +1276,31 @@ else
rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
-#line 1219 "configure"
+#line 1280 "configure"
+#include "confdefs.h"
+#include <assert.h>
+Syntax Error
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:1286: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+ :
+else
+ echo "$ac_err" >&5
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ CPP="${CC-cc} -nologo -E"
+ cat > conftest.$ac_ext <<EOF
+#line 1297 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1225: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
+{ (eval echo configure:1303: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
else
@@ -1235,6 +1313,8 @@ fi
rm -f conftest*
fi
rm -f conftest*
+fi
+rm -f conftest*
ac_cv_prog_CPP="$CPP"
fi
CPP="$ac_cv_prog_CPP"
@@ -1244,12 +1324,12 @@ fi
echo "$ac_t""$CPP" 1>&6
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:1248: checking for ANSI C header files" >&5
+echo "configure:1328: checking for ANSI C header files" >&5
if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1253 "configure"
+#line 1333 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
@@ -1257,8 +1337,8 @@ else
#include <float.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1261: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
+{ (eval echo configure:1341: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
ac_cv_header_stdc=yes
@@ -1274,7 +1354,7 @@ rm -f conftest*
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 1278 "configure"
+#line 1358 "configure"
#include "confdefs.h"
#include <string.h>
EOF
@@ -1292,7 +1372,7 @@ fi
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 1296 "configure"
+#line 1376 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
@@ -1313,7 +1393,7 @@ if test "$cross_compiling" = yes; then
:
else
cat > conftest.$ac_ext <<EOF
-#line 1317 "configure"
+#line 1397 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -1324,7 +1404,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
exit (0); }
EOF
-if { (eval echo configure:1328: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1408: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
@@ -1348,12 +1428,12 @@ EOF
fi
echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:1352: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:1432: checking whether time.h and sys/time.h may both be included" >&5
if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1357 "configure"
+#line 1437 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/time.h>
@@ -1362,7 +1442,7 @@ int main() {
struct tm *tp;
; return 0; }
EOF
-if { (eval echo configure:1366: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1446: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_header_time=yes
else
@@ -1386,18 +1466,18 @@ for ac_hdr in sys/resource.h sys/time.h unistd.h sys/ioctl.h sys/stat.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1390: checking for $ac_hdr" >&5
+echo "configure:1470: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1395 "configure"
+#line 1475 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1400: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
+{ (eval echo configure:1480: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
eval "ac_cv_header_$ac_safe=yes"
@@ -1422,22 +1502,22 @@ else
fi
done
-for ac_hdr in stddef.h
+for ac_hdr in stddef.h sys/sysinfo.h sys/proc.h sys/param.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1430: checking for $ac_hdr" >&5
+echo "configure:1510: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1435 "configure"
+#line 1515 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1440: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
+{ (eval echo configure:1520: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
eval "ac_cv_header_$ac_safe=yes"
@@ -1466,18 +1546,18 @@ for ac_hdr in io.h winsock.h sys/timeb.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1470: checking for $ac_hdr" >&5
+echo "configure:1550: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1475 "configure"
+#line 1555 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1480: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
+{ (eval echo configure:1560: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
eval "ac_cv_header_$ac_safe=yes"
@@ -1505,12 +1585,12 @@ done
echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:1509: checking for off_t" >&5
+echo "configure:1589: checking for off_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1514 "configure"
+#line 1594 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@@ -1519,7 +1599,7 @@ else
#endif
EOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- egrep "off_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
+ egrep "(^|[^a-zA-Z_0-9])off_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
rm -rf conftest*
ac_cv_type_off_t=yes
else
@@ -1538,12 +1618,12 @@ EOF
fi
echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:1542: checking for size_t" >&5
+echo "configure:1622: checking for size_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1547 "configure"
+#line 1627 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@@ -1552,7 +1632,7 @@ else
#endif
EOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- egrep "size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
+ egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
rm -rf conftest*
ac_cv_type_size_t=yes
else
@@ -1571,12 +1651,12 @@ EOF
fi
echo $ac_n "checking for ssize_t""... $ac_c" 1>&6
-echo "configure:1575: checking for ssize_t" >&5
+echo "configure:1655: checking for ssize_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_ssize_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1580 "configure"
+#line 1660 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@@ -1585,7 +1665,7 @@ else
#endif
EOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- egrep "ssize_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
+ egrep "(^|[^a-zA-Z_0-9])ssize_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
rm -rf conftest*
ac_cv_type_ssize_t=yes
else
@@ -1604,14 +1684,14 @@ EOF
fi
echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
-echo "configure:1608: checking whether byte ordering is bigendian" >&5
+echo "configure:1688: checking whether byte ordering is bigendian" >&5
if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_cv_c_bigendian=unknown
# See if sys/param.h defines the BYTE_ORDER macro.
cat > conftest.$ac_ext <<EOF
-#line 1615 "configure"
+#line 1695 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/param.h>
@@ -1622,11 +1702,11 @@ int main() {
#endif
; return 0; }
EOF
-if { (eval echo configure:1626: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1706: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
# It does; now see whether it defined to BIG_ENDIAN or not.
cat > conftest.$ac_ext <<EOF
-#line 1630 "configure"
+#line 1710 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/param.h>
@@ -1637,7 +1717,7 @@ int main() {
#endif
; return 0; }
EOF
-if { (eval echo configure:1641: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1721: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_bigendian=yes
else
@@ -1657,7 +1737,7 @@ if test "$cross_compiling" = yes; then
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
-#line 1661 "configure"
+#line 1741 "configure"
#include "confdefs.h"
main () {
/* Are we little or big endian? From Harbison&Steele. */
@@ -1670,7 +1750,7 @@ main () {
exit (u.c[sizeof (long) - 1] == 1);
}
EOF
-if { (eval echo configure:1674: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1754: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_c_bigendian=no
else
@@ -1694,7 +1774,7 @@ EOF
fi
echo $ac_n "checking size of char""... $ac_c" 1>&6
-echo "configure:1698: checking size of char" >&5
+echo "configure:1778: checking size of char" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_char'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1702,7 +1782,7 @@ else
ac_cv_sizeof_char=1
else
cat > conftest.$ac_ext <<EOF
-#line 1706 "configure"
+#line 1786 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -1713,7 +1793,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:1717: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1797: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_char=`cat conftestval`
else
@@ -1733,7 +1813,7 @@ EOF
echo $ac_n "checking size of short""... $ac_c" 1>&6
-echo "configure:1737: checking size of short" >&5
+echo "configure:1817: checking size of short" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1741,7 +1821,7 @@ else
ac_cv_sizeof_short=2
else
cat > conftest.$ac_ext <<EOF
-#line 1745 "configure"
+#line 1825 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -1752,7 +1832,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:1756: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1836: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_short=`cat conftestval`
else
@@ -1772,7 +1852,7 @@ EOF
echo $ac_n "checking size of int""... $ac_c" 1>&6
-echo "configure:1776: checking size of int" >&5
+echo "configure:1856: checking size of int" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1780,7 +1860,7 @@ else
ac_cv_sizeof_int=4
else
cat > conftest.$ac_ext <<EOF
-#line 1784 "configure"
+#line 1864 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -1791,7 +1871,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:1795: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1875: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_int=`cat conftestval`
else
@@ -1811,7 +1891,7 @@ EOF
echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:1815: checking size of long" >&5
+echo "configure:1895: checking size of long" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1819,7 +1899,7 @@ else
ac_cv_sizeof_long=4
else
cat > conftest.$ac_ext <<EOF
-#line 1823 "configure"
+#line 1903 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -1830,7 +1910,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:1834: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1914: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_long=`cat conftestval`
else
@@ -1850,7 +1930,7 @@ EOF
echo $ac_n "checking size of long long""... $ac_c" 1>&6
-echo "configure:1854: checking size of long long" >&5
+echo "configure:1934: checking size of long long" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1858,7 +1938,7 @@ else
ac_cv_sizeof_long_long=8
else
cat > conftest.$ac_ext <<EOF
-#line 1862 "configure"
+#line 1942 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -1869,7 +1949,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:1873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1953: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_long_long=`cat conftestval`
else
@@ -1889,7 +1969,7 @@ EOF
echo $ac_n "checking size of __int64""... $ac_c" 1>&6
-echo "configure:1893: checking size of __int64" >&5
+echo "configure:1973: checking size of __int64" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof___int64'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1897,7 +1977,7 @@ else
ac_cv_sizeof___int64=8
else
cat > conftest.$ac_ext <<EOF
-#line 1901 "configure"
+#line 1981 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -1908,7 +1988,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:1912: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1992: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof___int64=`cat conftestval`
else
@@ -1928,7 +2008,7 @@ EOF
echo $ac_n "checking size of float""... $ac_c" 1>&6
-echo "configure:1932: checking size of float" >&5
+echo "configure:2012: checking size of float" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_float'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1936,7 +2016,7 @@ else
ac_cv_sizeof_float=4
else
cat > conftest.$ac_ext <<EOF
-#line 1940 "configure"
+#line 2020 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -1947,7 +2027,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:1951: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2031: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_float=`cat conftestval`
else
@@ -1967,7 +2047,7 @@ EOF
echo $ac_n "checking size of double""... $ac_c" 1>&6
-echo "configure:1971: checking size of double" >&5
+echo "configure:2051: checking size of double" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_double'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1975,7 +2055,7 @@ else
ac_cv_sizeof_double=8
else
cat > conftest.$ac_ext <<EOF
-#line 1979 "configure"
+#line 2059 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -1986,7 +2066,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:1990: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2070: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_double=`cat conftestval`
else
@@ -2006,7 +2086,7 @@ EOF
echo $ac_n "checking size of long double""... $ac_c" 1>&6
-echo "configure:2010: checking size of long double" >&5
+echo "configure:2090: checking size of long double" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_long_double'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2014,7 +2094,7 @@ else
ac_cv_sizeof_long_double=8
else
cat > conftest.$ac_ext <<EOF
-#line 2018 "configure"
+#line 2098 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -2025,7 +2105,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:2029: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2109: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_long_double=`cat conftestval`
else
@@ -2049,7 +2129,7 @@ cat >>confdefs.h <<\EOF
#include <sys/types.h>
EOF
echo $ac_n "checking size of int8_t""... $ac_c" 1>&6
-echo "configure:2053: checking size of int8_t" >&5
+echo "configure:2133: checking size of int8_t" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_int8_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2057,7 +2137,7 @@ else
ac_cv_sizeof_int8_t=1
else
cat > conftest.$ac_ext <<EOF
-#line 2061 "configure"
+#line 2141 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -2068,7 +2148,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:2072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2152: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_int8_t=`cat conftestval`
else
@@ -2088,7 +2168,7 @@ EOF
echo $ac_n "checking size of uint8_t""... $ac_c" 1>&6
-echo "configure:2092: checking size of uint8_t" >&5
+echo "configure:2172: checking size of uint8_t" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_uint8_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2096,7 +2176,7 @@ else
ac_cv_sizeof_uint8_t=1
else
cat > conftest.$ac_ext <<EOF
-#line 2100 "configure"
+#line 2180 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -2107,7 +2187,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:2111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2191: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_uint8_t=`cat conftestval`
else
@@ -2127,7 +2207,7 @@ EOF
echo $ac_n "checking size of int16_t""... $ac_c" 1>&6
-echo "configure:2131: checking size of int16_t" >&5
+echo "configure:2211: checking size of int16_t" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_int16_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2135,7 +2215,7 @@ else
ac_cv_sizeof_int16_t=2
else
cat > conftest.$ac_ext <<EOF
-#line 2139 "configure"
+#line 2219 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -2146,7 +2226,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:2150: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2230: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_int16_t=`cat conftestval`
else
@@ -2166,7 +2246,7 @@ EOF
echo $ac_n "checking size of uint16_t""... $ac_c" 1>&6
-echo "configure:2170: checking size of uint16_t" >&5
+echo "configure:2250: checking size of uint16_t" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_uint16_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2174,7 +2254,7 @@ else
ac_cv_sizeof_uint16_t=2
else
cat > conftest.$ac_ext <<EOF
-#line 2178 "configure"
+#line 2258 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -2185,7 +2265,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:2189: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2269: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_uint16_t=`cat conftestval`
else
@@ -2205,7 +2285,7 @@ EOF
echo $ac_n "checking size of int32_t""... $ac_c" 1>&6
-echo "configure:2209: checking size of int32_t" >&5
+echo "configure:2289: checking size of int32_t" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_int32_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2213,7 +2293,7 @@ else
ac_cv_sizeof_int32_t=4
else
cat > conftest.$ac_ext <<EOF
-#line 2217 "configure"
+#line 2297 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -2224,7 +2304,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:2228: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2308: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_int32_t=`cat conftestval`
else
@@ -2244,7 +2324,7 @@ EOF
echo $ac_n "checking size of uint32_t""... $ac_c" 1>&6
-echo "configure:2248: checking size of uint32_t" >&5
+echo "configure:2328: checking size of uint32_t" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_uint32_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2252,7 +2332,7 @@ else
ac_cv_sizeof_uint32_t=4
else
cat > conftest.$ac_ext <<EOF
-#line 2256 "configure"
+#line 2336 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -2263,7 +2343,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:2267: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2347: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_uint32_t=`cat conftestval`
else
@@ -2283,7 +2363,7 @@ EOF
echo $ac_n "checking size of int64_t""... $ac_c" 1>&6
-echo "configure:2287: checking size of int64_t" >&5
+echo "configure:2367: checking size of int64_t" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_int64_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2291,7 +2371,7 @@ else
ac_cv_sizeof_int64_t=8
else
cat > conftest.$ac_ext <<EOF
-#line 2295 "configure"
+#line 2375 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -2302,7 +2382,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:2306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2386: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_int64_t=`cat conftestval`
else
@@ -2322,7 +2402,7 @@ EOF
echo $ac_n "checking size of uint64_t""... $ac_c" 1>&6
-echo "configure:2326: checking size of uint64_t" >&5
+echo "configure:2406: checking size of uint64_t" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_uint64_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2330,7 +2410,7 @@ else
ac_cv_sizeof_uint64_t=8
else
cat > conftest.$ac_ext <<EOF
-#line 2334 "configure"
+#line 2414 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -2341,7 +2421,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:2345: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_uint64_t=`cat conftestval`
else
@@ -2362,7 +2442,7 @@ EOF
echo $ac_n "checking size of size_t""... $ac_c" 1>&6
-echo "configure:2366: checking size of size_t" >&5
+echo "configure:2446: checking size of size_t" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_size_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2370,7 +2450,7 @@ else
ac_cv_sizeof_size_t=4
else
cat > conftest.$ac_ext <<EOF
-#line 2374 "configure"
+#line 2454 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -2381,7 +2461,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:2385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2465: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_size_t=`cat conftestval`
else
@@ -2404,7 +2484,7 @@ cat >>confdefs.h <<\EOF
#include <sys/types.h> /*for off_t definition*/
EOF
echo $ac_n "checking size of off_t""... $ac_c" 1>&6
-echo "configure:2408: checking size of off_t" >&5
+echo "configure:2488: checking size of off_t" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_off_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2412,7 +2492,7 @@ else
ac_cv_sizeof_off_t=4
else
cat > conftest.$ac_ext <<EOF
-#line 2416 "configure"
+#line 2496 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -2423,7 +2503,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:2427: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2507: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_off_t=`cat conftestval`
else
@@ -2450,7 +2530,7 @@ if test "${enable_hsizet+set}" = set; then
fi
echo $ac_n "checking for sizeof hsize_t and hssize_t""... $ac_c" 1>&6
-echo "configure:2454: checking for sizeof hsize_t and hssize_t" >&5
+echo "configure:2534: checking for sizeof hsize_t and hssize_t" >&5
case $HSIZET in
no|small)
echo "$ac_t""small" 1>&6
@@ -2479,18 +2559,18 @@ case $withval in
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2483: checking for $ac_hdr" >&5
+echo "configure:2563: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2488 "configure"
+#line 2568 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2493: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
+{ (eval echo configure:2573: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
eval "ac_cv_header_$ac_safe=yes"
@@ -2516,7 +2596,7 @@ fi
done
echo $ac_n "checking for compress in -lz""... $ac_c" 1>&6
-echo "configure:2520: checking for compress in -lz" >&5
+echo "configure:2600: checking for compress in -lz" >&5
ac_lib_var=`echo z'_'compress | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2524,7 +2604,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lz $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2528 "configure"
+#line 2608 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -2535,7 +2615,7 @@ int main() {
compress()
; return 0; }
EOF
-if { (eval echo configure:2539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2619: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2565,7 +2645,7 @@ fi
;;
no)
echo $ac_n "checking for GNU zlib""... $ac_c" 1>&6
-echo "configure:2569: checking for GNU zlib" >&5
+echo "configure:2649: checking for GNU zlib" >&5
echo "$ac_t""suppressed" 1>&6
;;
*)
@@ -2577,18 +2657,18 @@ echo "configure:2569: checking for GNU zlib" >&5
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2581: checking for $ac_hdr" >&5
+echo "configure:2661: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2586 "configure"
+#line 2666 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2591: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
+{ (eval echo configure:2671: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
eval "ac_cv_header_$ac_safe=yes"
@@ -2619,18 +2699,18 @@ done
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2623: checking for $ac_hdr" >&5
+echo "configure:2703: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2628 "configure"
+#line 2708 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2633: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
+{ (eval echo configure:2713: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
eval "ac_cv_header_$ac_safe=yes"
@@ -2662,7 +2742,7 @@ done
saved_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS -L$zlib_lib"
echo $ac_n "checking for compress in -lz""... $ac_c" 1>&6
-echo "configure:2666: checking for compress in -lz" >&5
+echo "configure:2746: checking for compress in -lz" >&5
ac_lib_var=`echo z'_'compress | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2670,7 +2750,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lz $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2674 "configure"
+#line 2754 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -2681,7 +2761,7 @@ int main() {
compress()
; return 0; }
EOF
-if { (eval echo configure:2685: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2711,7 +2791,7 @@ fi
else
echo $ac_n "checking for compress in -lz""... $ac_c" 1>&6
-echo "configure:2715: checking for compress in -lz" >&5
+echo "configure:2795: checking for compress in -lz" >&5
ac_lib_var=`echo z'_'compress | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2719,7 +2799,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lz $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2723 "configure"
+#line 2803 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -2730,7 +2810,7 @@ int main() {
compress()
; return 0; }
EOF
-if { (eval echo configure:2734: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2814: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2780,18 +2860,18 @@ case $withval in
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2784: checking for $ac_hdr" >&5
+echo "configure:2864: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2789 "configure"
+#line 2869 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2794: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
+{ (eval echo configure:2874: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
eval "ac_cv_header_$ac_safe=yes"
@@ -2818,7 +2898,7 @@ fi
done
echo $ac_n "checking for main in -ldf""... $ac_c" 1>&6
-echo "configure:2822: checking for main in -ldf" >&5
+echo "configure:2902: checking for main in -ldf" >&5
ac_lib_var=`echo df'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2826,14 +2906,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-ldf $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2830 "configure"
+#line 2910 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:2837: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2862,7 +2942,7 @@ unset H5TOH4 TESTH5TOH4
fi
echo $ac_n "checking for main in -lmfhdf""... $ac_c" 1>&6
-echo "configure:2866: checking for main in -lmfhdf" >&5
+echo "configure:2946: checking for main in -lmfhdf" >&5
ac_lib_var=`echo mfhdf'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2870,14 +2950,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lmfhdf $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2874 "configure"
+#line 2954 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:2881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2961: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2908,7 +2988,7 @@ fi
;;
no)
echo $ac_n "checking for HDF4""... $ac_c" 1>&6
-echo "configure:2912: checking for HDF4" >&5
+echo "configure:2992: checking for HDF4" >&5
echo "$ac_t""suppressed" 1>&6
unset H5TOH4 TESTH5TOH4
;;
@@ -2921,18 +3001,18 @@ echo "configure:2912: checking for HDF4" >&5
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2925: checking for $ac_hdr" >&5
+echo "configure:3005: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2930 "configure"
+#line 3010 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2935: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
+{ (eval echo configure:3015: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
eval "ac_cv_header_$ac_safe=yes"
@@ -2965,18 +3045,18 @@ done
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2969: checking for $ac_hdr" >&5
+echo "configure:3049: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2974 "configure"
+#line 3054 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2979: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
+{ (eval echo configure:3059: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
eval "ac_cv_header_$ac_safe=yes"
@@ -3008,7 +3088,7 @@ done
saved_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS -L$hdf4_lib"
echo $ac_n "checking for main in -ldf""... $ac_c" 1>&6
-echo "configure:3012: checking for main in -ldf" >&5
+echo "configure:3092: checking for main in -ldf" >&5
ac_lib_var=`echo df'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3016,14 +3096,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-ldf $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3020 "configure"
+#line 3100 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:3027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3107: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3052,7 +3132,7 @@ unset H5TOH4 TESTH5TOH4
fi
echo $ac_n "checking for main in -lmfhdf""... $ac_c" 1>&6
-echo "configure:3056: checking for main in -lmfhdf" >&5
+echo "configure:3136: checking for main in -lmfhdf" >&5
ac_lib_var=`echo mfhdf'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3060,14 +3140,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lmfhdf $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3064 "configure"
+#line 3144 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:3071: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3151: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3097,7 +3177,7 @@ fi
else
echo $ac_n "checking for main in -ldf""... $ac_c" 1>&6
-echo "configure:3101: checking for main in -ldf" >&5
+echo "configure:3181: checking for main in -ldf" >&5
ac_lib_var=`echo df'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3105,14 +3185,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-ldf $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3109 "configure"
+#line 3189 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:3116: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3196: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3140,7 +3220,7 @@ else
fi
echo $ac_n "checking for main in -lmfhdf""... $ac_c" 1>&6
-echo "configure:3144: checking for main in -lmfhdf" >&5
+echo "configure:3224: checking for main in -lmfhdf" >&5
ac_lib_var=`echo mfhdf'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3148,14 +3228,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lmfhdf $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3152 "configure"
+#line 3232 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:3159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3239: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3189,9 +3269,9 @@ esac
echo $ac_n "checking for tm_gmtoff in struct tm""... $ac_c" 1>&6
-echo "configure:3193: checking for tm_gmtoff in struct tm" >&5
+echo "configure:3273: checking for tm_gmtoff in struct tm" >&5
cat > conftest.$ac_ext <<EOF
-#line 3195 "configure"
+#line 3275 "configure"
#include "confdefs.h"
#include <sys/time.h>
@@ -3200,7 +3280,7 @@ int main() {
struct tm tm; tm.tm_gmtoff=0;
; return 0; }
EOF
-if { (eval echo configure:3204: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3284: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cat >> confdefs.h <<\EOF
#define HAVE_TM_GMTOFF 1
@@ -3216,9 +3296,9 @@ fi
rm -f conftest*
echo $ac_n "checking for __tm_gmtoff in struct tm""... $ac_c" 1>&6
-echo "configure:3220: checking for __tm_gmtoff in struct tm" >&5
+echo "configure:3300: checking for __tm_gmtoff in struct tm" >&5
cat > conftest.$ac_ext <<EOF
-#line 3222 "configure"
+#line 3302 "configure"
#include "confdefs.h"
#include <sys/time.h>
@@ -3227,7 +3307,7 @@ int main() {
struct tm tm; tm.__tm_gmtoff=0;
; return 0; }
EOF
-if { (eval echo configure:3231: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3311: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cat >> confdefs.h <<\EOF
#define HAVE___TM_GMTOFF 1
@@ -3243,9 +3323,9 @@ fi
rm -f conftest*
echo $ac_n "checking for global timezone variable""... $ac_c" 1>&6
-echo "configure:3247: checking for global timezone variable" >&5
+echo "configure:3327: checking for global timezone variable" >&5
cat > conftest.$ac_ext <<EOF
-#line 3249 "configure"
+#line 3329 "configure"
#include "confdefs.h"
#include <sys/time.h>
@@ -3254,7 +3334,7 @@ int main() {
timezone=0;
; return 0; }
EOF
-if { (eval echo configure:3258: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3338: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
cat >> confdefs.h <<\EOF
#define HAVE_TIMEZONE 1
@@ -3270,12 +3350,12 @@ fi
rm -f conftest*
echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
-echo "configure:3274: checking whether struct tm is in sys/time.h or time.h" >&5
+echo "configure:3354: checking whether struct tm is in sys/time.h or time.h" >&5
if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3279 "configure"
+#line 3359 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <time.h>
@@ -3283,7 +3363,7 @@ int main() {
struct tm *tp; tp->tm_sec;
; return 0; }
EOF
-if { (eval echo configure:3287: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3367: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_struct_tm=time.h
else
@@ -3304,12 +3384,12 @@ EOF
fi
echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6
-echo "configure:3308: checking for tm_zone in struct tm" >&5
+echo "configure:3388: checking for tm_zone in struct tm" >&5
if eval "test \"`echo '$''{'ac_cv_struct_tm_zone'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3313 "configure"
+#line 3393 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <$ac_cv_struct_tm>
@@ -3317,7 +3397,7 @@ int main() {
struct tm tm; tm.tm_zone;
; return 0; }
EOF
-if { (eval echo configure:3321: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3401: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_struct_tm_zone=yes
else
@@ -3337,12 +3417,12 @@ EOF
else
echo $ac_n "checking for tzname""... $ac_c" 1>&6
-echo "configure:3341: checking for tzname" >&5
+echo "configure:3421: checking for tzname" >&5
if eval "test \"`echo '$''{'ac_cv_var_tzname'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3346 "configure"
+#line 3426 "configure"
#include "confdefs.h"
#include <time.h>
#ifndef tzname /* For SGI. */
@@ -3352,7 +3432,7 @@ int main() {
atoi(*tzname);
; return 0; }
EOF
-if { (eval echo configure:3356: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3436: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_var_tzname=yes
else
@@ -3374,9 +3454,9 @@ EOF
fi
echo $ac_n "checking for struct timezone""... $ac_c" 1>&6
-echo "configure:3378: checking for struct timezone" >&5
+echo "configure:3458: checking for struct timezone" >&5
cat > conftest.$ac_ext <<EOF
-#line 3380 "configure"
+#line 3460 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -3386,7 +3466,7 @@ int main() {
struct timezone tz; tz.tz_minuteswest=0;
; return 0; }
EOF
-if { (eval echo configure:3390: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3470: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cat >> confdefs.h <<\EOF
#define HAVE_STRUCT_TIMEZONE 1
@@ -3402,9 +3482,9 @@ fi
rm -f conftest*
echo $ac_n "checking for st_blocks in struct stat""... $ac_c" 1>&6
-echo "configure:3406: checking for st_blocks in struct stat" >&5
+echo "configure:3486: checking for st_blocks in struct stat" >&5
cat > conftest.$ac_ext <<EOF
-#line 3408 "configure"
+#line 3488 "configure"
#include "confdefs.h"
#include <sys/stat.h>
@@ -3412,7 +3492,7 @@ int main() {
struct stat sb; sb.st_blocks=0;
; return 0; }
EOF
-if { (eval echo configure:3416: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3496: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cat >> confdefs.h <<\EOF
#define HAVE_STAT_ST_BLOCKS 1
@@ -3430,12 +3510,12 @@ rm -f conftest*
for ac_func in _getvideoconfig gettextinfo GetConsoleScreenBufferInfo
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3434: checking for $ac_func" >&5
+echo "configure:3514: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3439 "configure"
+#line 3519 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -3458,7 +3538,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:3462: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3542: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -3482,15 +3562,15 @@ else
fi
done
-for ac_func in _scrsize ioctl compress2
+for ac_func in _scrsize ioctl compress2 setsysinfo
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3489: checking for $ac_func" >&5
+echo "configure:3569: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3494 "configure"
+#line 3574 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -3513,7 +3593,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:3517: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3597: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -3539,16 +3619,16 @@ done
echo $ac_n "checking for struct videoconfig""... $ac_c" 1>&6
-echo "configure:3543: checking for struct videoconfig" >&5
+echo "configure:3623: checking for struct videoconfig" >&5
cat > conftest.$ac_ext <<EOF
-#line 3545 "configure"
+#line 3625 "configure"
#include "confdefs.h"
int main() {
struct videoconfig w; w.numtextcols=0;
; return 0; }
EOF
-if { (eval echo configure:3552: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3632: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cat >> confdefs.h <<\EOF
#define HAVE_STRUCT_VIDEOCONFIG 1
@@ -3564,16 +3644,16 @@ fi
rm -f conftest*
echo $ac_n "checking for struct text_info""... $ac_c" 1>&6
-echo "configure:3568: checking for struct text_info" >&5
+echo "configure:3648: checking for struct text_info" >&5
cat > conftest.$ac_ext <<EOF
-#line 3570 "configure"
+#line 3650 "configure"
#include "confdefs.h"
int main() {
struct text_info w; w.screenwidth=0;
; return 0; }
EOF
-if { (eval echo configure:3577: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3657: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cat >> confdefs.h <<\EOF
#define HAVE_STRUCT_TEXT_INFO 1
@@ -3589,16 +3669,16 @@ fi
rm -f conftest*
echo $ac_n "checking for TIOCGWINSZ""... $ac_c" 1>&6
-echo "configure:3593: checking for TIOCGWINSZ" >&5
+echo "configure:3673: checking for TIOCGWINSZ" >&5
cat > conftest.$ac_ext <<EOF
-#line 3595 "configure"
+#line 3675 "configure"
#include "confdefs.h"
#include <sys/ioctl.h>
int main() {
int w=TIOCGWINSZ;
; return 0; }
EOF
-if { (eval echo configure:3602: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3682: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cat >> confdefs.h <<\EOF
#define HAVE_TIOCGWINSZ 1
@@ -3614,16 +3694,16 @@ fi
rm -f conftest*
echo $ac_n "checking for TIOCGGETD""... $ac_c" 1>&6
-echo "configure:3618: checking for TIOCGGETD" >&5
+echo "configure:3698: checking for TIOCGGETD" >&5
cat > conftest.$ac_ext <<EOF
-#line 3620 "configure"
+#line 3700 "configure"
#include "confdefs.h"
#include <sys/ioctl.h>
int main() {
int w=TIOCGETD;
; return 0; }
EOF
-if { (eval echo configure:3627: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3707: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cat >> confdefs.h <<\EOF
#define HAVE_TIOCGETD 1
@@ -3642,12 +3722,12 @@ rm -f conftest*
for ac_func in getpwuid gethostname system getrusage fork waitpid
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3646: checking for $ac_func" >&5
+echo "configure:3726: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3651 "configure"
+#line 3731 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -3670,7 +3750,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:3674: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3754: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -3697,12 +3777,12 @@ done
for ac_func in gettimeofday BSDgettimeofday difftime sigaction snprintf
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3701: checking for $ac_func" >&5
+echo "configure:3781: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3706 "configure"
+#line 3786 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -3725,7 +3805,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:3729: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3809: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -3751,24 +3831,24 @@ done
cat > conftest.$ac_ext <<EOF
-#line 3755 "configure"
+#line 3835 "configure"
#include "confdefs.h"
#include<sys/types.h>
int main() {
off64_t n = 0;
; return 0; }
EOF
-if { (eval echo configure:3762: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3842: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
for ac_func in lseek64 fseek64
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3767: checking for $ac_func" >&5
+echo "configure:3847: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3772 "configure"
+#line 3852 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -3791,7 +3871,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:3795: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3875: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -3826,12 +3906,12 @@ rm -f conftest*
echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:3830: checking for working const" >&5
+echo "configure:3910: checking for working const" >&5
if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3835 "configure"
+#line 3915 "configure"
#include "confdefs.h"
int main() {
@@ -3880,7 +3960,7 @@ ccp = (char const *const *) p;
; return 0; }
EOF
-if { (eval echo configure:3884: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3964: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_const=yes
else
@@ -3901,21 +3981,21 @@ EOF
fi
echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:3905: checking for inline" >&5
+echo "configure:3985: checking for inline" >&5
if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_cv_c_inline=no
for ac_kw in inline __inline__ __inline; do
cat > conftest.$ac_ext <<EOF
-#line 3912 "configure"
+#line 3992 "configure"
#include "confdefs.h"
int main() {
} $ac_kw foo() {
; return 0; }
EOF
-if { (eval echo configure:3919: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3999: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_inline=$ac_kw; break
else
@@ -3942,16 +4022,16 @@ esac
echo $ac_n "checking for __attribute__ extension""... $ac_c" 1>&6
-echo "configure:3946: checking for __attribute__ extension" >&5
+echo "configure:4026: checking for __attribute__ extension" >&5
cat > conftest.$ac_ext <<EOF
-#line 3948 "configure"
+#line 4028 "configure"
#include "confdefs.h"
int main() {
int __attribute__((unused)) f(void){return 1;}
; return 0; }
EOF
-if { (eval echo configure:3955: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4035: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cat >> confdefs.h <<\EOF
#define HAVE_ATTRIBUTE 1
@@ -3967,16 +4047,16 @@ fi
rm -f conftest*
echo $ac_n "checking for __FUNCTION__ extension""... $ac_c" 1>&6
-echo "configure:3971: checking for __FUNCTION__ extension" >&5
+echo "configure:4051: checking for __FUNCTION__ extension" >&5
cat > conftest.$ac_ext <<EOF
-#line 3973 "configure"
+#line 4053 "configure"
#include "confdefs.h"
int main() {
int f(void){return __FUNCTION__;}
; return 0; }
EOF
-if { (eval echo configure:3980: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4060: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cat >> confdefs.h <<\EOF
#define HAVE_FUNCTION 1
@@ -3992,7 +4072,7 @@ fi
rm -f conftest*
echo $ac_n "checking how to print long long""... $ac_c" 1>&6
-echo "configure:3996: checking how to print long long" >&5
+echo "configure:4076: checking how to print long long" >&5
if eval "test \"`echo '$''{'hdf5_cv_printf_ll'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4001,7 +4081,7 @@ else
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
-#line 4005 "configure"
+#line 4085 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -4012,7 +4092,7 @@ else
sprintf(s,"%${hdf5_cv_printf_ll}d",x);
exit (strcmp(s,"1099511627776"));}
EOF
-if { (eval echo configure:4016: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4096: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
break
else
@@ -4032,7 +4112,7 @@ EOF
echo $ac_n "checking for debug flags""... $ac_c" 1>&6
-echo "configure:4036: checking for debug flags" >&5
+echo "configure:4116: checking for debug flags" >&5
# Check whether --enable-debug or --disable-debug was given.
if test "${enable_debug+set}" = set; then
enableval="$enable_debug"
@@ -4064,7 +4144,7 @@ if test "X" != "X$DEBUG_PKG"; then
fi
echo $ac_n "checking for API tracing""... $ac_c" 1>&6
-echo "configure:4068: checking for API tracing" >&5;
+echo "configure:4148: checking for API tracing" >&5;
# Check whether --enable-trace or --disable-trace was given.
if test "${enable_trace+set}" = set; then
enableval="$enable_trace"
@@ -4087,7 +4167,7 @@ if test "${enable_parallel+set}" = set; then
fi
echo $ac_n "checking for parallel support""... $ac_c" 1>&6
-echo "configure:4091: checking for parallel support" >&5;
+echo "configure:4171: checking for parallel support" >&5;
@@ -4115,7 +4195,7 @@ case "X-$PARALLEL" in
EOF
echo $ac_n "checking for MPI_Init in -lmpi""... $ac_c" 1>&6
-echo "configure:4119: checking for MPI_Init in -lmpi" >&5
+echo "configure:4199: checking for MPI_Init in -lmpi" >&5
ac_lib_var=`echo mpi'_'MPI_Init | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4123,7 +4203,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lmpi $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4127 "configure"
+#line 4207 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -4134,7 +4214,7 @@ int main() {
MPI_Init()
; return 0; }
EOF
-if { (eval echo configure:4138: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4218: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4162,7 +4242,7 @@ else
fi
echo $ac_n "checking for MPI_File_open in -lmpio""... $ac_c" 1>&6
-echo "configure:4166: checking for MPI_File_open in -lmpio" >&5
+echo "configure:4246: checking for MPI_File_open in -lmpio" >&5
ac_lib_var=`echo mpio'_'MPI_File_open | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4170,7 +4250,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lmpio $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4174 "configure"
+#line 4254 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -4181,7 +4261,7 @@ int main() {
MPI_File_open()
; return 0; }
EOF
-if { (eval echo configure:4185: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4265: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4279,7 +4359,7 @@ EOF
# Ultrix sh set writes to stderr and can't be redirected directly,
# and sets the high bit in the cache file unless we assign to the vars.
(set) 2>&1 |
- case `(ac_space=' '; set) 2>&1` in
+ case `(ac_space=' '; set | grep ac_space) 2>&1` in
*ac_space=\ *)
# `set' does not quote correctly, so add quotes (double-quote substitution
# turns \\\\ into \\, and sed turns \\ into \).
@@ -4346,7 +4426,7 @@ do
echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-version | --version | --versio | --versi | --vers | --ver | --ve | --v)
- echo "$CONFIG_STATUS generated by autoconf version 2.12"
+ echo "$CONFIG_STATUS generated by autoconf version 2.13"
exit 0 ;;
-help | --help | --hel | --he | --h)
echo "\$ac_cs_usage"; exit 0 ;;
@@ -4368,9 +4448,11 @@ sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
$ac_vpsub
$extrasub
+s%@SHELL@%$SHELL%g
s%@CFLAGS@%$CFLAGS%g
s%@CPPFLAGS@%$CPPFLAGS%g
s%@CXXFLAGS@%$CXXFLAGS%g
+s%@FFLAGS@%$FFLAGS%g
s%@DEFS@%$DEFS%g
s%@LDFLAGS@%$LDFLAGS%g
s%@LIBS@%$LIBS%g
@@ -4397,6 +4479,7 @@ s%@host_os@%$host_os%g
s%@CC@%$CC%g
s%@SET_MAKE@%$SET_MAKE%g
s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
+s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
s%@INSTALL_DATA@%$INSTALL_DATA%g
s%@RANLIB@%$RANLIB%g
s%@AR@%$AR%g
diff --git a/configure.in b/configure.in
index daa070f..e11fb3b 100644
--- a/configure.in
+++ b/configure.in
@@ -143,7 +143,7 @@ AC_HEADER_STDC
AC_HEADER_TIME
dnl Unix
AC_CHECK_HEADERS(sys/resource.h sys/time.h unistd.h sys/ioctl.h sys/stat.h)
-AC_CHECK_HEADERS(stddef.h)
+AC_CHECK_HEADERS(stddef.h sys/sysinfo.h sys/proc.h sys/param.h)
dnl Windows
AC_CHECK_HEADERS(io.h winsock.h sys/timeb.h)
@@ -348,7 +348,7 @@ dnl ----------------------------------------------------------------------
dnl How do we figure out the width of a tty in characters?
dnl
AC_CHECK_FUNCS(_getvideoconfig gettextinfo GetConsoleScreenBufferInfo)
-AC_CHECK_FUNCS(_scrsize ioctl compress2)
+AC_CHECK_FUNCS(_scrsize ioctl compress2 setsysinfo)
AC_MSG_CHECKING(for struct videoconfig)
AC_TRY_COMPILE(,[struct videoconfig w; w.numtextcols=0;],
diff --git a/src/.distdep b/src/.distdep
index aa275bb..afdefb5 100644
--- a/src/.distdep
+++ b/src/.distdep
@@ -26,10 +26,7 @@ H5.o: \
H5Gprivate.h \
H5Gpublic.h \
H5Oprivate.h \
- H5Opublic.h \
- H5HGprivate.h \
- H5HGpublic.h \
- H5Tprivate.h
+ H5Opublic.h
H5A.o: \
H5A.c \
H5private.h \
@@ -61,7 +58,9 @@ H5A.o: \
H5MMprivate.h \
H5MMpublic.h \
H5Pprivate.h \
- H5Ppublic.h
+ H5Ppublic.h \
+ H5Apkg.h \
+ H5Aprivate.h
H5AC.o: \
H5AC.c \
H5private.h \
@@ -73,7 +72,9 @@ H5AC.o: \
H5Fprivate.h \
H5Fpublic.h \
H5Ipublic.h \
- H5Dpublic.h
+ H5Dpublic.h \
+ H5Eprivate.h \
+ H5Epublic.h
H5B.o: \
H5B.c \
H5private.h \
@@ -90,7 +91,9 @@ H5B.o: \
H5Bpublic.h \
H5Eprivate.h \
H5Epublic.h \
- H5MFprivate.h
+ H5MFprivate.h \
+ H5MFpublic.h \
+ H5MMprivate.h
H5D.o: \
H5D.c \
H5private.h \
@@ -127,14 +130,52 @@ H5D.o: \
H5MFpublic.h \
H5MMprivate.h \
H5MMpublic.h \
- H5Pprivate.h
+ H5Pprivate.h \
+ H5Ppublic.h \
+ H5TBprivate.h
H5E.o: \
H5E.c \
H5private.h \
H5public.h \
H5config.h \
H5api_adpt.h \
- H5Iprivate.h
+ H5Iprivate.h \
+ H5Ipublic.h \
+ H5Eprivate.h
+H5F.o: \
+ H5F.c \
+ H5private.h \
+ H5public.h \
+ H5config.h \
+ H5api_adpt.h \
+ H5Aprivate.h \
+ H5Apublic.h \
+ H5Ipublic.h \
+ H5Gprivate.h \
+ H5Gpublic.h \
+ H5Bprivate.h \
+ H5Bpublic.h \
+ H5Fprivate.h \
+ H5Fpublic.h \
+ H5Dpublic.h \
+ H5Dprivate.h \
+ H5Oprivate.h \
+ H5Opublic.h \
+ H5HGprivate.h \
+ H5HGpublic.h \
+ H5Tprivate.h \
+ H5Tpublic.h \
+ H5Sprivate.h \
+ H5Spublic.h \
+ H5Zprivate.h \
+ H5Zpublic.h \
+ H5Iprivate.h \
+ H5ACprivate.h \
+ H5ACpublic.h \
+ H5Eprivate.h \
+ H5Epublic.h \
+ H5MMprivate.h \
+ H5MMpublic.h
H5Farray.o: \
H5Farray.c \
H5private.h \
@@ -161,7 +202,9 @@ H5Farray.o: \
H5Zprivate.h \
H5Zpublic.h \
H5Eprivate.h \
- H5Epublic.h
+ H5Epublic.h \
+ H5MFprivate.h \
+ H5MFpublic.h
H5Fcore.o: \
H5Fcore.c \
H5private.h \
@@ -170,10 +213,7 @@ H5Fcore.o: \
H5api_adpt.h \
H5Eprivate.h \
H5Epublic.h \
- H5Ipublic.h \
- H5Fprivate.h \
- H5Fpublic.h \
- H5Dpublic.h
+ H5Ipublic.h
H5Ffamily.o: \
H5Ffamily.c \
H5private.h \
@@ -182,10 +222,7 @@ H5Ffamily.o: \
H5api_adpt.h \
H5Eprivate.h \
H5Epublic.h \
- H5Ipublic.h \
- H5Fprivate.h \
- H5Fpublic.h \
- H5Dpublic.h
+ H5Ipublic.h
H5Fistore.o: \
H5Fistore.c \
H5private.h \
@@ -212,7 +249,18 @@ H5Fistore.o: \
H5Zprivate.h \
H5Zpublic.h \
H5Eprivate.h \
- H5Epublic.h
+ H5Epublic.h \
+ H5MFprivate.h \
+ H5MFpublic.h
+H5Flow.o: \
+ H5Flow.c \
+ H5private.h \
+ H5public.h \
+ H5config.h \
+ H5api_adpt.h \
+ H5Eprivate.h \
+ H5Epublic.h \
+ H5Ipublic.h
H5Fmpio.o: \
H5Fmpio.c \
H5private.h \
@@ -236,10 +284,7 @@ H5Fmpio.o: \
H5HGpublic.h \
H5Tprivate.h \
H5Tpublic.h \
- H5Sprivate.h \
- H5Spublic.h \
- H5Zprivate.h \
- H5Zpublic.h
+ H5Sprivate.h
H5Fsec2.o: \
H5Fsec2.c \
H5private.h \
@@ -248,10 +293,7 @@ H5Fsec2.o: \
H5api_adpt.h \
H5Eprivate.h \
H5Epublic.h \
- H5Ipublic.h \
- H5Fprivate.h \
- H5Fpublic.h \
- H5Dpublic.h
+ H5Ipublic.h
H5Fsplit.o: \
H5Fsplit.c \
H5private.h \
@@ -263,7 +305,9 @@ H5Fsplit.o: \
H5Ipublic.h \
H5Fprivate.h \
H5Fpublic.h \
- H5Dpublic.h
+ H5Dpublic.h \
+ H5MFprivate.h \
+ H5MFpublic.h
H5Fstdio.o: \
H5Fstdio.c \
H5private.h \
@@ -272,10 +316,41 @@ H5Fstdio.o: \
H5api_adpt.h \
H5Eprivate.h \
H5Epublic.h \
+ H5Ipublic.h
+H5G.o: \
+ H5G.c \
+ H5private.h \
+ H5public.h \
+ H5config.h \
+ H5api_adpt.h \
+ H5Aprivate.h \
+ H5Apublic.h \
H5Ipublic.h \
+ H5Gprivate.h \
+ H5Gpublic.h \
+ H5Bprivate.h \
+ H5Bpublic.h \
H5Fprivate.h \
H5Fpublic.h \
- H5Dpublic.h
+ H5Dpublic.h \
+ H5Dprivate.h \
+ H5Oprivate.h \
+ H5Opublic.h \
+ H5HGprivate.h \
+ H5HGpublic.h \
+ H5Tprivate.h \
+ H5Tpublic.h \
+ H5Sprivate.h \
+ H5Spublic.h \
+ H5Zprivate.h \
+ H5Zpublic.h \
+ H5Eprivate.h \
+ H5Epublic.h \
+ H5Gpkg.h \
+ H5ACprivate.h \
+ H5ACpublic.h \
+ H5HLprivate.h \
+ H5HLpublic.h
H5Gent.o: \
H5Gent.c \
H5private.h \
@@ -294,10 +369,7 @@ H5Gent.o: \
H5Gprivate.h \
H5Gpublic.h \
H5Bprivate.h \
- H5Bpublic.h \
- H5HLprivate.h \
- H5HLpublic.h \
- H5MMprivate.h
+ H5Bpublic.h
H5Gnode.o: \
H5Gnode.c \
H5private.h \
@@ -329,7 +401,9 @@ H5Gnode.o: \
H5HGpublic.h \
H5Tprivate.h \
H5Tpublic.h \
- H5Sprivate.h
+ H5Sprivate.h \
+ H5Spublic.h \
+ H5Zprivate.h
H5Gstab.o: \
H5Gstab.c \
H5private.h \
@@ -359,9 +433,7 @@ H5Gstab.o: \
H5HGpublic.h \
H5Tprivate.h \
H5Tpublic.h \
- H5Sprivate.h \
- H5Spublic.h \
- H5Zprivate.h
+ H5Sprivate.h
H5HG.o: \
H5HG.c \
H5private.h \
@@ -378,7 +450,9 @@ H5HG.o: \
H5Epublic.h \
H5HGprivate.h \
H5HGpublic.h \
- H5MFprivate.h
+ H5MFprivate.h \
+ H5MFpublic.h \
+ H5MMprivate.h
H5HL.o: \
H5HL.c \
H5private.h \
@@ -395,14 +469,18 @@ H5HL.o: \
H5Epublic.h \
H5HLprivate.h \
H5HLpublic.h \
- H5MFprivate.h
+ H5MFprivate.h \
+ H5MFpublic.h \
+ H5MMprivate.h
H5I.o: \
H5I.c \
H5private.h \
H5public.h \
H5config.h \
H5api_adpt.h \
- H5Iprivate.h
+ H5Iprivate.h \
+ H5Ipublic.h \
+ H5Eprivate.h
H5MF.o: \
H5MF.c \
H5private.h \
@@ -411,17 +489,16 @@ H5MF.o: \
H5api_adpt.h \
H5Eprivate.h \
H5Epublic.h \
- H5Ipublic.h \
- H5Fprivate.h \
- H5Fpublic.h \
- H5Dpublic.h
+ H5Ipublic.h
H5MM.o: \
H5MM.c \
H5private.h \
H5public.h \
H5config.h \
H5api_adpt.h \
- H5Eprivate.h
+ H5Eprivate.h \
+ H5Epublic.h \
+ H5Ipublic.h
H5O.o: \
H5O.c \
H5private.h \
@@ -450,10 +527,7 @@ H5O.o: \
H5HGprivate.h \
H5HGpublic.h \
H5Tprivate.h \
- H5Tpublic.h \
- H5Sprivate.h \
- H5Spublic.h \
- H5Zprivate.h
+ H5Tpublic.h
H5Oattr.o: \
H5Oattr.c \
H5private.h \
@@ -480,34 +554,9 @@ H5Oattr.o: \
H5Tpublic.h \
H5Sprivate.h \
H5Spublic.h \
- H5Zprivate.h
-H5Ocomp.o: \
- H5Ocomp.c \
- H5private.h \
- H5public.h \
- H5config.h \
- H5api_adpt.h \
- H5Eprivate.h \
- H5Epublic.h \
- H5Ipublic.h \
- H5MMprivate.h \
- H5MMpublic.h \
- H5Oprivate.h \
- H5Opublic.h \
- H5Fprivate.h \
- H5Fpublic.h \
- H5Dpublic.h \
- H5Gprivate.h \
- H5Gpublic.h \
- H5Bprivate.h \
- H5Bpublic.h \
- H5HGprivate.h \
- H5HGpublic.h \
- H5Tprivate.h \
- H5Tpublic.h \
- H5Sprivate.h \
- H5Spublic.h \
- H5Zprivate.h
+ H5Zprivate.h \
+ H5Zpublic.h \
+ H5Apkg.h
H5Ocont.o: \
H5Ocont.c \
H5private.h \
@@ -531,10 +580,7 @@ H5Ocont.o: \
H5HGprivate.h \
H5HGpublic.h \
H5Tprivate.h \
- H5Tpublic.h \
- H5Sprivate.h \
- H5Spublic.h \
- H5Zprivate.h
+ H5Tpublic.h
H5Odtype.o: \
H5Odtype.c \
H5private.h \
@@ -561,7 +607,9 @@ H5Odtype.o: \
H5Tpublic.h \
H5Sprivate.h \
H5Spublic.h \
- H5Zprivate.h
+ H5Zprivate.h \
+ H5Zpublic.h \
+ H5Tpkg.h
H5Oefl.o: \
H5Oefl.c \
H5private.h \
@@ -588,7 +636,9 @@ H5Oefl.o: \
H5HGpublic.h \
H5Tprivate.h \
H5Tpublic.h \
- H5Sprivate.h
+ H5Sprivate.h \
+ H5Spublic.h \
+ H5Zprivate.h
H5Ofill.o: \
H5Ofill.c \
H5private.h \
@@ -612,10 +662,7 @@ H5Ofill.o: \
H5Bpublic.h \
H5HGprivate.h \
H5HGpublic.h \
- H5Tprivate.h \
- H5Tpublic.h \
- H5Sprivate.h \
- H5Spublic.h
+ H5Tprivate.h
H5Olayout.o: \
H5Olayout.c \
H5private.h \
@@ -639,10 +686,7 @@ H5Olayout.o: \
H5Tpublic.h \
H5Sprivate.h \
H5Spublic.h \
- H5Zprivate.h \
- H5Zpublic.h \
- H5Eprivate.h \
- H5Epublic.h
+ H5Zprivate.h
H5Omtime.o: \
H5Omtime.c \
H5private.h \
@@ -666,10 +710,7 @@ H5Omtime.o: \
H5HGprivate.h \
H5HGpublic.h \
H5Tprivate.h \
- H5Tpublic.h \
- H5Sprivate.h \
- H5Spublic.h \
- H5Zprivate.h
+ H5Tpublic.h
H5Oname.o: \
H5Oname.c \
H5private.h \
@@ -693,10 +734,7 @@ H5Oname.o: \
H5HGprivate.h \
H5HGpublic.h \
H5Tprivate.h \
- H5Tpublic.h \
- H5Sprivate.h \
- H5Spublic.h \
- H5Zprivate.h
+ H5Tpublic.h
H5Onull.o: \
H5Onull.c \
H5private.h \
@@ -715,10 +753,7 @@ H5Onull.o: \
H5Bpublic.h \
H5HGprivate.h \
H5HGpublic.h \
- H5Tprivate.h \
- H5Tpublic.h \
- H5Sprivate.h \
- H5Spublic.h
+ H5Tprivate.h
H5Osdspace.o: \
H5Osdspace.c \
H5private.h \
@@ -742,10 +777,7 @@ H5Osdspace.o: \
H5HGprivate.h \
H5HGpublic.h \
H5Tprivate.h \
- H5Tpublic.h \
- H5Sprivate.h \
- H5Spublic.h \
- H5Zprivate.h
+ H5Tpublic.h
H5Oshared.o: \
H5Oshared.c \
H5private.h \
@@ -769,10 +801,7 @@ H5Oshared.o: \
H5HGprivate.h \
H5HGpublic.h \
H5Tprivate.h \
- H5Tpublic.h \
- H5Sprivate.h \
- H5Spublic.h \
- H5Zprivate.h
+ H5Tpublic.h
H5Ostab.o: \
H5Ostab.c \
H5private.h \
@@ -796,10 +825,7 @@ H5Ostab.o: \
H5HGprivate.h \
H5HGpublic.h \
H5Tprivate.h \
- H5Tpublic.h \
- H5Sprivate.h \
- H5Spublic.h \
- H5Zprivate.h
+ H5Tpublic.h
H5P.o: \
H5P.c \
H5private.h \
@@ -826,7 +852,9 @@ H5P.o: \
H5Spublic.h \
H5Zprivate.h \
H5Zpublic.h \
- H5Eprivate.h
+ H5Eprivate.h \
+ H5Epublic.h \
+ H5MMprivate.h
H5R.o: \
H5R.c \
H5private.h \
@@ -853,7 +881,38 @@ H5R.o: \
H5Spublic.h \
H5Zprivate.h \
H5Zpublic.h \
- H5Eprivate.h
+ H5Eprivate.h \
+ H5Epublic.h \
+ H5MMprivate.h
+H5RA.o: \
+ H5RA.c \
+ H5RAprivate.h \
+ H5RApublic.h \
+ H5Ipublic.h \
+ H5public.h \
+ H5config.h \
+ H5api_adpt.h \
+ H5Dprivate.h \
+ H5Dpublic.h \
+ H5private.h \
+ H5Fprivate.h \
+ H5Fpublic.h \
+ H5Gprivate.h \
+ H5Gpublic.h \
+ H5Bprivate.h \
+ H5Bpublic.h \
+ H5Oprivate.h \
+ H5Opublic.h \
+ H5HGprivate.h \
+ H5HGpublic.h \
+ H5Tprivate.h \
+ H5Tpublic.h \
+ H5Sprivate.h \
+ H5Spublic.h \
+ H5Zprivate.h \
+ H5Zpublic.h \
+ H5Eprivate.h \
+ H5Epublic.h
H5S.o: \
H5S.c \
H5private.h \
@@ -877,10 +936,7 @@ H5S.o: \
H5Bpublic.h \
H5HGprivate.h \
H5HGpublic.h \
- H5Tprivate.h \
- H5Tpublic.h \
- H5Sprivate.h \
- H5Spublic.h
+ H5Tprivate.h
H5Sall.o: \
H5Sall.c \
H5private.h \
@@ -904,10 +960,36 @@ H5Sall.o: \
H5HGprivate.h \
H5HGpublic.h \
H5Tprivate.h \
+ H5Tpublic.h
+H5Shyper.o: \
+ H5Shyper.c \
+ H5private.h \
+ H5public.h \
+ H5config.h \
+ H5api_adpt.h \
+ H5Eprivate.h \
+ H5Epublic.h \
+ H5Ipublic.h \
+ H5Sprivate.h \
+ H5Spublic.h \
+ H5Fprivate.h \
+ H5Fpublic.h \
+ H5Dpublic.h \
+ H5Gprivate.h \
+ H5Gpublic.h \
+ H5Bprivate.h \
+ H5Bpublic.h \
+ H5Oprivate.h \
+ H5Opublic.h \
+ H5HGprivate.h \
+ H5HGpublic.h \
+ H5Tprivate.h \
H5Tpublic.h \
H5Zprivate.h \
H5Zpublic.h \
- H5Vprivate.h
+ H5Vprivate.h \
+ H5MMprivate.h \
+ H5MMpublic.h
H5Smpio.o: \
H5Smpio.c \
H5private.h \
@@ -929,7 +1011,9 @@ H5Smpio.o: \
H5Oprivate.h \
H5Opublic.h \
H5HGprivate.h \
- H5HGpublic.h
+ H5HGpublic.h \
+ H5Tprivate.h \
+ H5Tpublic.h
H5Snone.o: \
H5Snone.c \
H5private.h \
@@ -953,10 +1037,7 @@ H5Snone.o: \
H5HGprivate.h \
H5HGpublic.h \
H5Tprivate.h \
- H5Tpublic.h \
- H5Zprivate.h \
- H5Zpublic.h \
- H5Vprivate.h
+ H5Tpublic.h
H5Spoint.o: \
H5Spoint.c \
H5private.h \
@@ -983,7 +1064,9 @@ H5Spoint.o: \
H5HGpublic.h \
H5Tprivate.h \
H5Tpublic.h \
- H5Zprivate.h
+ H5Zprivate.h \
+ H5Zpublic.h \
+ H5Vprivate.h
H5Sselect.o: \
H5Sselect.c \
H5private.h \
@@ -1010,7 +1093,9 @@ H5Sselect.o: \
H5HGprivate.h \
H5HGpublic.h \
H5Tprivate.h \
- H5Tpublic.h
+ H5Tpublic.h \
+ H5Zprivate.h \
+ H5Zpublic.h
H5T.o: \
H5T.c \
H5private.h \
@@ -1039,24 +1124,9 @@ H5T.o: \
H5Iprivate.h \
H5Eprivate.h \
H5Epublic.h \
- H5MMprivate.h \
- H5MMpublic.h \
- H5Tpkg.h \
- H5Rprivate.h
-H5TB.o: \
- H5TB.c \
- H5private.h \
- H5public.h \
- H5config.h \
- H5api_adpt.h \
- H5Iprivate.h \
- H5Ipublic.h \
- H5Eprivate.h \
- H5Epublic.h \
- H5MMprivate.h \
- H5MMpublic.h
-H5V.o: \
- H5V.c \
+ H5MMprivate.h
+H5Tbit.o: \
+ H5Tbit.c \
H5private.h \
H5public.h \
H5config.h \
@@ -1064,118 +1134,45 @@ H5V.o: \
H5Eprivate.h \
H5Epublic.h \
H5Ipublic.h \
- H5Oprivate.h \
- H5Opublic.h \
+ H5Iprivate.h \
+ H5Tpkg.h \
+ H5HGprivate.h \
+ H5HGpublic.h \
H5Fprivate.h \
H5Fpublic.h \
H5Dpublic.h \
- H5Gprivate.h \
- H5Gpublic.h \
- H5Bprivate.h \
- H5Bpublic.h \
- H5HGprivate.h \
- H5HGpublic.h \
- H5Tprivate.h \
- H5Tpublic.h
-H5RA.o: \
- H5RA.c \
- H5RAprivate.h \
- H5RApublic.h \
+ H5Rprivate.h \
+ H5Rpublic.h \
+ H5Tprivate.h
+H5Tconv.o: \
+ H5Tconv.c \
+ H5Iprivate.h \
H5Ipublic.h \
H5public.h \
H5config.h \
H5api_adpt.h \
- H5Dprivate.h \
- H5Dpublic.h \
H5private.h \
- H5Fprivate.h \
- H5Fpublic.h \
- H5Gprivate.h \
- H5Gpublic.h \
- H5Bprivate.h \
- H5Bpublic.h \
- H5Oprivate.h \
- H5Opublic.h \
- H5HGprivate.h \
- H5HGpublic.h \
- H5Tprivate.h \
- H5Tpublic.h \
- H5Sprivate.h \
- H5Spublic.h \
- H5Zprivate.h \
- H5Zpublic.h \
H5Eprivate.h \
H5Epublic.h \
- H5Iprivate.h \
H5MMprivate.h \
- H5MMpublic.h
-H5Shyper.o: \
- H5Shyper.c \
- H5private.h \
- H5public.h \
- H5config.h \
- H5api_adpt.h \
- H5Eprivate.h \
- H5Epublic.h \
- H5Ipublic.h \
- H5Sprivate.h \
- H5Spublic.h \
+ H5MMpublic.h \
+ H5Tpkg.h \
+ H5HGprivate.h \
+ H5HGpublic.h \
H5Fprivate.h \
H5Fpublic.h \
H5Dpublic.h \
- H5Gprivate.h \
- H5Gpublic.h \
- H5Bprivate.h \
- H5Bpublic.h \
- H5Oprivate.h \
- H5Opublic.h \
- H5HGprivate.h \
- H5HGpublic.h \
- H5Tprivate.h \
- H5Tpublic.h \
- H5Zprivate.h \
- H5Zpublic.h \
- H5Vprivate.h
-H5F.o: \
- H5F.c \
+ H5Rprivate.h \
+ H5Rpublic.h \
+ H5Tprivate.h
+H5Tinit.o: \
+ H5Tinit.c \
H5private.h \
H5public.h \
H5config.h \
H5api_adpt.h \
- H5Aprivate.h \
- H5Apublic.h \
- H5Ipublic.h \
- H5Gprivate.h \
- H5Gpublic.h \
- H5Bprivate.h \
- H5Bpublic.h \
- H5Fprivate.h \
- H5Fpublic.h \
- H5Dpublic.h \
- H5Dprivate.h \
- H5Oprivate.h \
- H5Opublic.h \
- H5HGprivate.h \
- H5HGpublic.h \
- H5Tprivate.h \
- H5Tpublic.h \
- H5Sprivate.h \
- H5Spublic.h \
- H5Zprivate.h \
- H5Zpublic.h \
- H5Iprivate.h \
- H5ACprivate.h \
- H5ACpublic.h \
- H5Eprivate.h \
- H5Epublic.h
-H5Tconv.o: \
- H5Tconv.c \
H5Iprivate.h \
H5Ipublic.h \
- H5public.h \
- H5config.h \
- H5api_adpt.h \
- H5private.h \
H5Eprivate.h \
H5Epublic.h \
H5MMprivate.h \
@@ -1192,57 +1189,41 @@ H5Tconv.o: \
H5Tpublic.h \
H5Gprivate.h \
H5Gpublic.h
-H5Flow.o: \
- H5Flow.c \
+H5TB.o: \
+ H5TB.c \
H5private.h \
H5public.h \
H5config.h \
H5api_adpt.h \
- H5Eprivate.h \
- H5Epublic.h \
+ H5Iprivate.h \
H5Ipublic.h \
- H5Fprivate.h \
- H5Fpublic.h \
- H5Dpublic.h
-H5G.o: \
- H5G.c \
+ H5Eprivate.h
+H5V.o: \
+ H5V.c \
H5private.h \
H5public.h \
H5config.h \
H5api_adpt.h \
- H5Aprivate.h \
- H5Apublic.h \
+ H5Eprivate.h \
+ H5Epublic.h \
H5Ipublic.h \
+ H5Oprivate.h \
+ H5Opublic.h \
+ H5Fprivate.h \
+ H5Fpublic.h \
+ H5Dpublic.h \
H5Gprivate.h \
H5Gpublic.h \
H5Bprivate.h \
H5Bpublic.h \
- H5Fprivate.h \
- H5Fpublic.h \
- H5Dpublic.h \
- H5Dprivate.h \
- H5Oprivate.h \
- H5Opublic.h \
H5HGprivate.h \
H5HGpublic.h \
H5Tprivate.h \
H5Tpublic.h \
H5Sprivate.h \
- H5Spublic.h \
- H5Zprivate.h \
- H5Zpublic.h \
- H5Eprivate.h \
- H5Epublic.h \
- H5Gpkg.h \
- H5ACprivate.h \
- H5ACpublic.h \
- H5HLprivate.h \
- H5HLpublic.h \
- H5Iprivate.h \
- H5MMprivate.h \
- H5MMpublic.h
-H5Tbit.o: \
- H5Tbit.c \
+ H5Spublic.h
+H5Z.o: \
+ H5Z.c \
H5private.h \
H5public.h \
H5config.h \
@@ -1250,43 +1231,27 @@ H5Tbit.o: \
H5Eprivate.h \
H5Epublic.h \
H5Ipublic.h \
- H5Iprivate.h \
- H5Tpkg.h \
- H5HGprivate.h \
- H5HGpublic.h \
+ H5MMprivate.h \
+ H5MMpublic.h \
+ H5Oprivate.h \
+ H5Opublic.h \
H5Fprivate.h \
H5Fpublic.h \
H5Dpublic.h \
- H5Rprivate.h \
- H5Rpublic.h \
- H5Tprivate.h \
- H5Tpublic.h \
H5Gprivate.h \
- H5Gpublic.h
-H5Tinit.o: \
- H5Tinit.c \
- H5private.h \
- H5public.h \
- H5config.h \
- H5api_adpt.h \
- H5Iprivate.h \
- H5Ipublic.h \
- H5Eprivate.h \
- H5Epublic.h \
- H5MMprivate.h \
- H5MMpublic.h \
- H5Tpkg.h \
+ H5Gpublic.h \
+ H5Bprivate.h \
+ H5Bpublic.h \
H5HGprivate.h \
H5HGpublic.h \
- H5Fprivate.h \
- H5Fpublic.h \
- H5Dpublic.h \
- H5Rprivate.h \
- H5Rpublic.h \
H5Tprivate.h \
- H5Tpublic.h
-H5Z.o: \
- H5Z.c \
+ H5Tpublic.h \
+ H5Sprivate.h \
+ H5Spublic.h \
+ H5Zprivate.h \
+ H5Zpublic.h
+H5Ocomp.o: \
+ H5Ocomp.c \
H5private.h \
H5public.h \
H5config.h \
@@ -1308,7 +1273,4 @@ H5Z.o: \
H5HGprivate.h \
H5HGpublic.h \
H5Tprivate.h \
- H5Tpublic.h \
- H5Sprivate.h \
- H5Spublic.h \
- H5Zprivate.h
+ H5Tpublic.h
diff --git a/src/H5Ocomp.c b/src/H5Ocomp.c
index 33e927c..a21bf01 100644
--- a/src/H5Ocomp.c
+++ b/src/H5Ocomp.c
@@ -449,7 +449,7 @@ H5O_pline_debug (H5F_t __unused__ *f, const void *mesg, FILE *stream,
(unsigned long)(pline->filter[i].cd_nelmts));
for (j=0; j<pline->filter[i].cd_nelmts; j++) {
char field_name[32];
- sprintf(field_name, "CD value %d", j);
+ sprintf(field_name, "CD value %lu", (unsigned long)j);
fprintf(stream, "%*s%-*s %lu\n", indent+6, "", MAX(0, fwidth-6),
field_name,
(unsigned long)(pline->filter[i].cd_values[j]));
diff --git a/src/H5Tconv.c b/src/H5Tconv.c
index 462bc25..5c91a68 100644
--- a/src/H5Tconv.c
+++ b/src/H5Tconv.c
@@ -305,7 +305,7 @@ static intn interface_initialize_g = 0;
if (d_mv) priv->d_aligned += nelmts; \
for (elmtno=0; elmtno<nelmts; elmtno++, DIR src, DIR dst) { \
if (s_mv) { \
- memcpy(&aligned, src, sizeof(ST)); \
+ HDmemcpy(&aligned, src, sizeof(ST)); \
s = (ST*)&aligned; \
} else { \
s = src; \
@@ -317,7 +317,7 @@ static intn interface_initialize_g = 0;
}
/* ... user-defined stuff here ... */
#define CI_END \
- if (d_mv) memcpy(dst, &aligned, dt_size); \
+ if (d_mv) HDmemcpy(dst, &aligned, dt_size); \
} \
break; \
default: \
@@ -4718,7 +4718,7 @@ H5T_conv_float_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
for (elmtno=0; elmtno<nelmts; elmtno++, --src, --dst) {
/* Align source and/or destination */
if (src_mv) {
- memcpy(&aligned, src, sizeof(float));
+ HDmemcpy(&aligned, src, sizeof(float));
s = (float*)&aligned;
} else {
s = src;
@@ -4730,7 +4730,7 @@ H5T_conv_float_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*d = *s;
/* Unalign destination */
- if (dst_mv) memcpy(dst, &aligned, sizeof(double));
+ if (dst_mv) HDmemcpy(dst, &aligned, sizeof(double));
}
break;
@@ -4821,7 +4821,7 @@ H5T_conv_double_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
for (elmtno=0; elmtno<nelmts; elmtno++, src++, dst++) {
/* Align source and/or destination */
if (src_mv) {
- memcpy(&aligned, src, sizeof(double));
+ HDmemcpy(&aligned, src, sizeof(double));
s = (double*)&aligned;
} else {
s = src;
@@ -4845,7 +4845,7 @@ H5T_conv_double_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
}
/* Unalign destination */
- if (dst_mv) memcpy(dst, &aligned, sizeof(float));
+ if (dst_mv) HDmemcpy(dst, &aligned, sizeof(float));
}
break;
diff --git a/src/H5config.h.in b/src/H5config.h.in
index fd69a2c..abe9531 100644
--- a/src/H5config.h.in
+++ b/src/H5config.h.in
@@ -176,6 +176,9 @@
/* Define if you have the lseek64 function. */
#undef HAVE_LSEEK64
+/* Define if you have the setsysinfo function. */
+#undef HAVE_SETSYSINFO
+
/* Define if you have the sigaction function. */
#undef HAVE_SIGACTION
@@ -200,12 +203,21 @@
/* Define if you have the <sys/ioctl.h> header file. */
#undef HAVE_SYS_IOCTL_H
+/* Define if you have the <sys/param.h> header file. */
+#undef HAVE_SYS_PARAM_H
+
+/* Define if you have the <sys/proc.h> header file. */
+#undef HAVE_SYS_PROC_H
+
/* Define if you have the <sys/resource.h> header file. */
#undef HAVE_SYS_RESOURCE_H
/* Define if you have the <sys/stat.h> header file. */
#undef HAVE_SYS_STAT_H
+/* Define if you have the <sys/sysinfo.h> header file. */
+#undef HAVE_SYS_SYSINFO_H
+
/* Define if you have the <sys/time.h> header file. */
#undef HAVE_SYS_TIME_H
diff --git a/src/H5detect.c b/src/H5detect.c
index 683b76b..8ee0fcc 100644
--- a/src/H5detect.c
+++ b/src/H5detect.c
@@ -898,6 +898,22 @@ main(void)
detected_t d[MAXDETECT];
int nd = 0;
+#if defined(HAVE_SETSYSINFO) && defined(SSI_NVPAIRS)
+#if defined(UAC_NOPRINT) && defined(UAC_SIGBUS)
+ /*
+ * Make sure unaligned access generates SIGBUS and doesn't print warning
+ * messages so that we can detect alignment constraints on the DEC Alpha.
+ */
+ int nvpairs[2];
+ nvpairs[0] = SSIN_UACPROC;
+ nvpairs[1] = UAC_NOPRINT | UAC_SIGBUS;
+ if (setsysinfo(SSI_NVPAIRS, nvpairs, 1, 0, 0)<0) {
+ fprintf(stderr, "H5detect: unable to turn off UAC handling: %s\n",
+ strerror(errno));
+ }
+#endif
+#endif
+
print_header();
DETECT_I(signed char, SCHAR, d[nd]); nd++;
diff --git a/src/H5private.h b/src/H5private.h
index fac7fa1..487f83a 100644
--- a/src/H5private.h
+++ b/src/H5private.h
@@ -90,6 +90,23 @@
#endif
/*
+ * System information. These are needed on the DEC Alpha to turn off fixing
+ * of unaligned accesses by the operating system during detection of
+ * alignment constraints in H5detect.c:main(). The <sys/param.h> must be
+ * included before <sys/proc.h> on FreeBSD even though we never use anything
+ * from either header file on that system.
+ */
+#ifdef HAVE_SYS_SYSINFO_H
+# include <sys/sysinfo.h>
+#endif
+#ifdef HAVE_SYS_PARAM_H
+# include <sys/param.h>
+#endif
+#ifdef HAVE_SYS_PROC_H
+# include <sys/proc.h>
+#endif
+
+/*
* Win32 is severely broken when it comes to ANSI-C and Posix.1 compliance.
*/
#ifdef HAVE_IO_H
@@ -540,8 +557,12 @@ __DLL__ int HDfprintf (FILE *stream, const char *fmt, ...);
#define HDmbtowc(P,S,Z) mbtowc(P,S,Z)
#define HDmemchr(S,C,Z) memchr(S,C,Z)
#define HDmemcmp(X,Y,Z) memcmp(X,Y,Z)
-#define HDmemcpy(X,Y,Z) memcpy(X,Y,Z)
-#define HDmemmove(X,Y,Z) memmove(X,Y,Z)
+/*
+ * The (char*) casts are required for the DEC when optimizations are turned
+ * on and the source and/or destination are not aligned.
+ */
+#define HDmemcpy(X,Y,Z) memcpy((char*)(X),(const char*)(Y),Z)
+#define HDmemmove(X,Y,Z) memmove((char*)(X),(const char*)(Y),Z)
#define HDmemset(X,C,Z) memset(X,C,Z)
#define HDmkdir(S,M) mkdir(S,M)
#define HDmkfifo(S,M) mkfifo(S,M)
diff --git a/test/.distdep b/test/.distdep
index 7e65416..581ae53 100644
--- a/test/.distdep
+++ b/test/.distdep
@@ -30,8 +30,8 @@ h5test.o: \
../src/H5Fprivate.h \
../src/H5Rprivate.h \
../src/H5Tprivate.h
-bittests.o: \
- bittests.c \
+big.o: \
+ big.c \
h5test.h \
../src/hdf5.h \
../src/H5public.h \
@@ -62,8 +62,9 @@ bittests.o: \
../src/H5Fprivate.h \
../src/H5Rprivate.h \
../src/H5Tprivate.h
-chunk.o: \
- chunk.c \
+bittests.o: \
+ bittests.c \
+ h5test.h \
../src/hdf5.h \
../src/H5public.h \
../src/H5config.h \
@@ -86,10 +87,15 @@ chunk.o: \
../src/H5Rpublic.h \
../src/H5RApublic.h \
../src/H5Spublic.h \
- ../src/H5Tpublic.h
-extend.o: \
- extend.c \
- h5test.h \
+ ../src/H5Tpublic.h \
+ ../src/H5private.h \
+ ../src/H5Tpkg.h \
+ ../src/H5HGprivate.h \
+ ../src/H5Fprivate.h \
+ ../src/H5Rprivate.h \
+ ../src/H5Tprivate.h
+chunk.o: \
+ chunk.c \
../src/hdf5.h \
../src/H5public.h \
../src/H5config.h \
@@ -112,15 +118,9 @@ extend.o: \
../src/H5Rpublic.h \
../src/H5RApublic.h \
../src/H5Spublic.h \
- ../src/H5Tpublic.h \
- ../src/H5private.h \
- ../src/H5Tpkg.h \
- ../src/H5HGprivate.h \
- ../src/H5Fprivate.h \
- ../src/H5Rprivate.h \
- ../src/H5Tprivate.h
-fillval.o: \
- fillval.c \
+ ../src/H5Tpublic.h
+cmpd_dset.o: \
+ cmpd_dset.c \
h5test.h \
../src/hdf5.h \
../src/H5public.h \
@@ -151,8 +151,8 @@ fillval.o: \
../src/H5Fprivate.h \
../src/H5Rprivate.h \
../src/H5Tprivate.h
-flush1.o: \
- flush1.c \
+dsets.o: \
+ dsets.c \
h5test.h \
../src/hdf5.h \
../src/H5public.h \
@@ -183,8 +183,8 @@ flush1.o: \
../src/H5Fprivate.h \
../src/H5Rprivate.h \
../src/H5Tprivate.h
-flush2.o: \
- flush2.c \
+dtypes.o: \
+ dtypes.c \
h5test.h \
../src/hdf5.h \
../src/H5public.h \
@@ -215,8 +215,8 @@ flush2.o: \
../src/H5Fprivate.h \
../src/H5Rprivate.h \
../src/H5Tprivate.h
-gheap.o: \
- gheap.c \
+extend.o: \
+ extend.c \
h5test.h \
../src/hdf5.h \
../src/H5public.h \
@@ -246,18 +246,10 @@ gheap.o: \
../src/H5HGprivate.h \
../src/H5Fprivate.h \
../src/H5Rprivate.h \
- ../src/H5Tprivate.h \
- ../src/H5Gprivate.h \
- ../src/H5Bprivate.h \
- ../src/H5Eprivate.h
-hyperslab.o: \
- hyperslab.c \
- ../src/H5private.h \
- ../src/H5public.h \
- ../src/H5config.h \
- ../src/H5api_adpt.h
-iopipe.o: \
- iopipe.c \
+ ../src/H5Tprivate.h
+external.o: \
+ external.c \
+ h5test.h \
../src/hdf5.h \
../src/H5public.h \
../src/H5config.h \
@@ -280,9 +272,15 @@ iopipe.o: \
../src/H5Rpublic.h \
../src/H5RApublic.h \
../src/H5Spublic.h \
- ../src/H5Tpublic.h
-istore.o: \
- istore.c \
+ ../src/H5Tpublic.h \
+ ../src/H5private.h \
+ ../src/H5Tpkg.h \
+ ../src/H5HGprivate.h \
+ ../src/H5Fprivate.h \
+ ../src/H5Rprivate.h \
+ ../src/H5Tprivate.h
+fillval.o: \
+ fillval.c \
h5test.h \
../src/hdf5.h \
../src/H5public.h \
@@ -312,18 +310,9 @@ istore.o: \
../src/H5HGprivate.h \
../src/H5Fprivate.h \
../src/H5Rprivate.h \
- ../src/H5Tprivate.h \
- ../src/H5Gprivate.h \
- ../src/H5Bprivate.h \
- ../src/H5Dprivate.h \
- ../src/H5Oprivate.h \
- ../src/H5Sprivate.h \
- ../src/H5Zprivate.h \
- ../src/H5Iprivate.h \
- ../src/H5Pprivate.h \
- ../src/H5MMprivate.h
-lheap.o: \
- lheap.c \
+ ../src/H5Tprivate.h
+flush1.o: \
+ flush1.c \
h5test.h \
../src/hdf5.h \
../src/H5public.h \
@@ -353,12 +342,9 @@ lheap.o: \
../src/H5HGprivate.h \
../src/H5Fprivate.h \
../src/H5Rprivate.h \
- ../src/H5Tprivate.h \
- ../src/H5Gprivate.h \
- ../src/H5Bprivate.h \
- ../src/H5HLprivate.h
-links.o: \
- links.c \
+ ../src/H5Tprivate.h
+flush2.o: \
+ flush2.c \
h5test.h \
../src/hdf5.h \
../src/H5public.h \
@@ -389,8 +375,8 @@ links.o: \
../src/H5Fprivate.h \
../src/H5Rprivate.h \
../src/H5Tprivate.h
-mount.o: \
- mount.c \
+gheap.o: \
+ gheap.c \
h5test.h \
../src/hdf5.h \
../src/H5public.h \
@@ -420,9 +406,12 @@ mount.o: \
../src/H5HGprivate.h \
../src/H5Fprivate.h \
../src/H5Rprivate.h \
- ../src/H5Tprivate.h
-overhead.o: \
- overhead.c \
+ ../src/H5Tprivate.h \
+ ../src/H5Gprivate.h \
+ ../src/H5Bprivate.h \
+ ../src/H5Eprivate.h
+iopipe.o: \
+ iopipe.c \
../src/hdf5.h \
../src/H5public.h \
../src/H5config.h \
@@ -446,8 +435,9 @@ overhead.o: \
../src/H5RApublic.h \
../src/H5Spublic.h \
../src/H5Tpublic.h
-ragged.o: \
- ragged.c \
+istore.o: \
+ istore.c \
+ h5test.h \
../src/hdf5.h \
../src/H5public.h \
../src/H5config.h \
@@ -471,9 +461,23 @@ ragged.o: \
../src/H5RApublic.h \
../src/H5Spublic.h \
../src/H5Tpublic.h \
- ../src/H5private.h
-stab.o: \
- stab.c \
+ ../src/H5private.h \
+ ../src/H5Tpkg.h \
+ ../src/H5HGprivate.h \
+ ../src/H5Fprivate.h \
+ ../src/H5Rprivate.h \
+ ../src/H5Tprivate.h \
+ ../src/H5Gprivate.h \
+ ../src/H5Bprivate.h \
+ ../src/H5Dprivate.h \
+ ../src/H5Oprivate.h \
+ ../src/H5Sprivate.h \
+ ../src/H5Zprivate.h \
+ ../src/H5Iprivate.h \
+ ../src/H5Pprivate.h \
+ ../src/H5MMprivate.h
+lheap.o: \
+ lheap.c \
h5test.h \
../src/hdf5.h \
../src/H5public.h \
@@ -506,22 +510,20 @@ stab.o: \
../src/H5Tprivate.h \
../src/H5Gprivate.h \
../src/H5Bprivate.h \
- ../src/H5Gpkg.h
-tattr.o: \
- tattr.c \
- testhdf5.h \
- ../src/H5private.h \
+ ../src/H5HLprivate.h
+links.o: \
+ links.c \
+ h5test.h \
+ ../src/hdf5.h \
../src/H5public.h \
../src/H5config.h \
../src/H5api_adpt.h \
- ../src/H5Eprivate.h \
- ../src/H5Epublic.h \
../src/H5Ipublic.h \
- ../src/hdf5.h \
../src/H5Apublic.h \
../src/H5ACpublic.h \
../src/H5Bpublic.h \
../src/H5Dpublic.h \
+ ../src/H5Epublic.h \
../src/H5Fpublic.h \
../src/H5Gpublic.h \
../src/H5HGpublic.h \
@@ -531,83 +533,29 @@ tattr.o: \
../src/H5Opublic.h \
../src/H5Ppublic.h \
../src/H5Zpublic.h \
- ../src/H5Rpublic.h
-testhdf5.o: \
- testhdf5.c \
- testhdf5.h \
- ../src/H5private.h \
- ../src/H5public.h \
- ../src/H5config.h \
- ../src/H5api_adpt.h
-tfile.o: \
- tfile.c \
- testhdf5.h \
- ../src/H5private.h \
- ../src/H5public.h \
- ../src/H5config.h \
- ../src/H5api_adpt.h \
- ../src/H5Eprivate.h \
- ../src/H5Epublic.h \
- ../src/H5Ipublic.h \
- ../src/H5Bprivate.h \
- ../src/H5Bpublic.h \
- ../src/H5Fprivate.h \
- ../src/H5Fpublic.h \
- ../src/H5Dpublic.h \
- ../src/H5Pprivate.h
-th5s.o: \
- th5s.c \
- testhdf5.h \
- ../src/H5private.h \
- ../src/H5public.h \
- ../src/H5config.h \
- ../src/H5api_adpt.h \
- ../src/H5Eprivate.h \
- ../src/H5Epublic.h \
- ../src/H5Ipublic.h \
- ../src/H5Bprivate.h \
- ../src/H5Bpublic.h \
- ../src/H5Fprivate.h \
- ../src/H5Fpublic.h \
- ../src/H5Dpublic.h \
- ../src/H5Sprivate.h \
+ ../src/H5Rpublic.h \
+ ../src/H5RApublic.h \
../src/H5Spublic.h \
- ../src/H5Gprivate.h \
- ../src/H5Gpublic.h \
- ../src/H5Oprivate.h \
- ../src/H5Opublic.h \
- ../src/H5HGprivate.h \
- ../src/H5HGpublic.h \
- ../src/H5Tprivate.h \
../src/H5Tpublic.h \
- ../src/H5Zprivate.h \
- ../src/H5Zpublic.h \
- ../src/H5Pprivate.h
-tmeta.o: \
- tmeta.c \
- testhdf5.h \
- ../src/H5private.h \
- ../src/H5public.h \
- ../src/H5config.h \
- ../src/H5api_adpt.h \
- ../src/H5Eprivate.h \
- ../src/H5Epublic.h \
- ../src/H5Ipublic.h
-trefer.o: \
- trefer.c \
- testhdf5.h \
../src/H5private.h \
+ ../src/H5Tpkg.h \
+ ../src/H5HGprivate.h \
+ ../src/H5Fprivate.h \
+ ../src/H5Rprivate.h \
+ ../src/H5Tprivate.h
+mount.o: \
+ mount.c \
+ h5test.h \
+ ../src/hdf5.h \
../src/H5public.h \
../src/H5config.h \
../src/H5api_adpt.h \
- ../src/H5Eprivate.h \
- ../src/H5Epublic.h \
../src/H5Ipublic.h \
- ../src/hdf5.h \
../src/H5Apublic.h \
../src/H5ACpublic.h \
../src/H5Bpublic.h \
../src/H5Dpublic.h \
+ ../src/H5Epublic.h \
../src/H5Fpublic.h \
../src/H5Gpublic.h \
../src/H5HGpublic.h \
@@ -617,22 +565,29 @@ trefer.o: \
../src/H5Opublic.h \
../src/H5Ppublic.h \
../src/H5Zpublic.h \
- ../src/H5Rpublic.h
-tselect.o: \
- tselect.c \
- testhdf5.h \
+ ../src/H5Rpublic.h \
+ ../src/H5RApublic.h \
+ ../src/H5Spublic.h \
+ ../src/H5Tpublic.h \
../src/H5private.h \
+ ../src/H5Tpkg.h \
+ ../src/H5HGprivate.h \
+ ../src/H5Fprivate.h \
+ ../src/H5Rprivate.h \
+ ../src/H5Tprivate.h
+mtime.o: \
+ mtime.c \
+ h5test.h \
+ ../src/hdf5.h \
../src/H5public.h \
../src/H5config.h \
../src/H5api_adpt.h \
- ../src/H5Eprivate.h \
- ../src/H5Epublic.h \
../src/H5Ipublic.h \
- ../src/hdf5.h \
../src/H5Apublic.h \
../src/H5ACpublic.h \
../src/H5Bpublic.h \
../src/H5Dpublic.h \
+ ../src/H5Epublic.h \
../src/H5Fpublic.h \
../src/H5Gpublic.h \
../src/H5HGpublic.h \
@@ -642,9 +597,18 @@ tselect.o: \
../src/H5Opublic.h \
../src/H5Ppublic.h \
../src/H5Zpublic.h \
- ../src/H5Rpublic.h
-unlink.o: \
- unlink.c \
+ ../src/H5Rpublic.h \
+ ../src/H5RApublic.h \
+ ../src/H5Spublic.h \
+ ../src/H5Tpublic.h \
+ ../src/H5private.h \
+ ../src/H5Tpkg.h \
+ ../src/H5HGprivate.h \
+ ../src/H5Fprivate.h \
+ ../src/H5Rprivate.h \
+ ../src/H5Tprivate.h
+ohdr.o: \
+ ohdr.c \
h5test.h \
../src/hdf5.h \
../src/H5public.h \
@@ -674,10 +638,15 @@ unlink.o: \
../src/H5HGprivate.h \
../src/H5Fprivate.h \
../src/H5Rprivate.h \
- ../src/H5Tprivate.h
-external.o: \
- external.c \
- h5test.h \
+ ../src/H5Tprivate.h \
+ ../src/H5Gprivate.h \
+ ../src/H5Bprivate.h \
+ ../src/H5Iprivate.h \
+ ../src/H5Oprivate.h \
+ ../src/H5Sprivate.h \
+ ../src/H5Zprivate.h
+overhead.o: \
+ overhead.c \
../src/hdf5.h \
../src/H5public.h \
../src/H5config.h \
@@ -700,16 +669,9 @@ external.o: \
../src/H5Rpublic.h \
../src/H5RApublic.h \
../src/H5Spublic.h \
- ../src/H5Tpublic.h \
- ../src/H5private.h \
- ../src/H5Tpkg.h \
- ../src/H5HGprivate.h \
- ../src/H5Fprivate.h \
- ../src/H5Rprivate.h \
- ../src/H5Tprivate.h
-big.o: \
- big.c \
- h5test.h \
+ ../src/H5Tpublic.h
+ragged.o: \
+ ragged.c \
../src/hdf5.h \
../src/H5public.h \
../src/H5config.h \
@@ -733,14 +695,9 @@ big.o: \
../src/H5RApublic.h \
../src/H5Spublic.h \
../src/H5Tpublic.h \
- ../src/H5private.h \
- ../src/H5Tpkg.h \
- ../src/H5HGprivate.h \
- ../src/H5Fprivate.h \
- ../src/H5Rprivate.h \
- ../src/H5Tprivate.h
-cmpd_dset.o: \
- cmpd_dset.c \
+ ../src/H5private.h
+stab.o: \
+ stab.c \
h5test.h \
../src/hdf5.h \
../src/H5public.h \
@@ -770,20 +727,25 @@ cmpd_dset.o: \
../src/H5HGprivate.h \
../src/H5Fprivate.h \
../src/H5Rprivate.h \
- ../src/H5Tprivate.h
-mtime.o: \
- mtime.c \
- h5test.h \
- ../src/hdf5.h \
+ ../src/H5Tprivate.h \
+ ../src/H5Gprivate.h \
+ ../src/H5Bprivate.h \
+ ../src/H5Gpkg.h
+tattr.o: \
+ tattr.c \
+ testhdf5.h \
+ ../src/H5private.h \
../src/H5public.h \
../src/H5config.h \
../src/H5api_adpt.h \
+ ../src/H5Eprivate.h \
+ ../src/H5Epublic.h \
../src/H5Ipublic.h \
+ ../src/hdf5.h \
../src/H5Apublic.h \
../src/H5ACpublic.h \
../src/H5Bpublic.h \
../src/H5Dpublic.h \
- ../src/H5Epublic.h \
../src/H5Fpublic.h \
../src/H5Gpublic.h \
../src/H5HGpublic.h \
@@ -795,27 +757,85 @@ mtime.o: \
../src/H5Zpublic.h \
../src/H5Rpublic.h \
../src/H5RApublic.h \
+ ../src/H5Spublic.h
+testhdf5.o: \
+ testhdf5.c \
+ testhdf5.h \
+ ../src/H5private.h \
+ ../src/H5public.h \
+ ../src/H5config.h \
+ ../src/H5api_adpt.h \
+ ../src/H5Eprivate.h \
+ ../src/H5Epublic.h
+tfile.o: \
+ tfile.c \
+ testhdf5.h \
+ ../src/H5private.h \
+ ../src/H5public.h \
+ ../src/H5config.h \
+ ../src/H5api_adpt.h \
+ ../src/H5Eprivate.h \
+ ../src/H5Epublic.h \
+ ../src/H5Ipublic.h \
+ ../src/H5Bprivate.h \
+ ../src/H5Bpublic.h \
+ ../src/H5Fprivate.h \
+ ../src/H5Fpublic.h \
+ ../src/H5Dpublic.h
+th5s.o: \
+ th5s.c \
+ testhdf5.h \
+ ../src/H5private.h \
+ ../src/H5public.h \
+ ../src/H5config.h \
+ ../src/H5api_adpt.h \
+ ../src/H5Eprivate.h \
+ ../src/H5Epublic.h \
+ ../src/H5Ipublic.h \
+ ../src/H5Bprivate.h \
+ ../src/H5Bpublic.h \
+ ../src/H5Fprivate.h \
+ ../src/H5Fpublic.h \
+ ../src/H5Dpublic.h \
+ ../src/H5Sprivate.h \
../src/H5Spublic.h \
+ ../src/H5Gprivate.h \
+ ../src/H5Gpublic.h \
+ ../src/H5Oprivate.h \
+ ../src/H5Opublic.h \
+ ../src/H5HGprivate.h \
+ ../src/H5HGpublic.h \
+ ../src/H5Tprivate.h \
../src/H5Tpublic.h \
+ ../src/H5Zprivate.h \
+ ../src/H5Zpublic.h
+tmeta.o: \
+ tmeta.c \
+ testhdf5.h \
../src/H5private.h \
- ../src/H5Tpkg.h \
- ../src/H5HGprivate.h \
+ ../src/H5public.h \
+ ../src/H5config.h \
+ ../src/H5api_adpt.h \
+ ../src/H5Eprivate.h \
+ ../src/H5Epublic.h \
+ ../src/H5Ipublic.h \
../src/H5Fprivate.h \
- ../src/H5Rprivate.h \
- ../src/H5Tprivate.h
-ohdr.o: \
- ohdr.c \
- h5test.h \
- ../src/hdf5.h \
+ ../src/H5Fpublic.h
+trefer.o: \
+ trefer.c \
+ testhdf5.h \
+ ../src/H5private.h \
../src/H5public.h \
../src/H5config.h \
../src/H5api_adpt.h \
+ ../src/H5Eprivate.h \
+ ../src/H5Epublic.h \
../src/H5Ipublic.h \
+ ../src/hdf5.h \
../src/H5Apublic.h \
../src/H5ACpublic.h \
../src/H5Bpublic.h \
../src/H5Dpublic.h \
- ../src/H5Epublic.h \
../src/H5Fpublic.h \
../src/H5Gpublic.h \
../src/H5HGpublic.h \
@@ -827,33 +847,22 @@ ohdr.o: \
../src/H5Zpublic.h \
../src/H5Rpublic.h \
../src/H5RApublic.h \
- ../src/H5Spublic.h \
- ../src/H5Tpublic.h \
+ ../src/H5Spublic.h
+tselect.o: \
+ tselect.c \
+ testhdf5.h \
../src/H5private.h \
- ../src/H5Tpkg.h \
- ../src/H5HGprivate.h \
- ../src/H5Fprivate.h \
- ../src/H5Rprivate.h \
- ../src/H5Tprivate.h \
- ../src/H5Gprivate.h \
- ../src/H5Bprivate.h \
- ../src/H5Iprivate.h \
- ../src/H5Oprivate.h \
- ../src/H5Sprivate.h \
- ../src/H5Zprivate.h
-enum.o: \
- enum.c \
- h5test.h \
- ../src/hdf5.h \
../src/H5public.h \
../src/H5config.h \
../src/H5api_adpt.h \
+ ../src/H5Eprivate.h \
+ ../src/H5Epublic.h \
../src/H5Ipublic.h \
+ ../src/hdf5.h \
../src/H5Apublic.h \
../src/H5ACpublic.h \
../src/H5Bpublic.h \
../src/H5Dpublic.h \
- ../src/H5Epublic.h \
../src/H5Fpublic.h \
../src/H5Gpublic.h \
../src/H5HGpublic.h \
@@ -865,16 +874,9 @@ enum.o: \
../src/H5Zpublic.h \
../src/H5Rpublic.h \
../src/H5RApublic.h \
- ../src/H5Spublic.h \
- ../src/H5Tpublic.h \
- ../src/H5private.h \
- ../src/H5Tpkg.h \
- ../src/H5HGprivate.h \
- ../src/H5Fprivate.h \
- ../src/H5Rprivate.h \
- ../src/H5Tprivate.h
-dsets.o: \
- dsets.c \
+ ../src/H5Spublic.h
+unlink.o: \
+ unlink.c \
h5test.h \
../src/hdf5.h \
../src/H5public.h \
@@ -905,8 +907,8 @@ dsets.o: \
../src/H5Fprivate.h \
../src/H5Rprivate.h \
../src/H5Tprivate.h
-dtypes.o: \
- dtypes.c \
+enum.o: \
+ enum.c \
h5test.h \
../src/hdf5.h \
../src/H5public.h \
@@ -937,3 +939,11 @@ dtypes.o: \
../src/H5Fprivate.h \
../src/H5Rprivate.h \
../src/H5Tprivate.h
+hyperslab.o: \
+ hyperslab.c \
+ ../src/H5private.h \
+ ../src/H5public.h \
+ ../src/H5config.h \
+ ../src/H5api_adpt.h \
+ ../src/H5MMprivate.h \
+ ../src/H5MMpublic.h
diff --git a/test/dtypes.c b/test/dtypes.c
index 588815e..0047560 100644
--- a/test/dtypes.c
+++ b/test/dtypes.c
@@ -1294,7 +1294,7 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst)
unsigned char dst_bits[32]; /*dest value in LE order*/
size_t src_nbits; /*source length in bits */
size_t dst_nbits; /*dst length in bits */
- long_long aligned; /*restrictive alignment */
+ void *aligned=NULL; /*aligned temp buffer */
signed char hw_char;
unsigned char hw_uchar;
short hw_short;
@@ -1395,6 +1395,7 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst)
dst_size = H5Tget_size(dst);
buf = aligned_malloc(nelmts*MAX(src_size, dst_size));
saved = aligned_malloc(nelmts*MAX(src_size, dst_size));
+ aligned = malloc(sizeof(long_long));
#ifdef SHOW_OVERFLOWS
noverflows_g = 0;
#endif
@@ -1428,47 +1429,49 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst)
hw = (unsigned char*)&hw_char;
switch (src_type) {
case INT_CHAR:
- memcpy(&aligned, (signed char*)saved+j, sizeof(char));
- hw_char = (char)(*((signed char*)&aligned));
+ memcpy(aligned, saved+j*sizeof(char), sizeof(char));
+ hw_char = (char)(*((signed char*)aligned));
break;
case INT_UCHAR:
- memcpy(&aligned, (unsigned char*)saved+j, sizeof(char));
- hw_char = (char)(*((unsigned char*)&aligned));
+ memcpy(aligned, saved+j*sizeof(char), sizeof(char));
+ hw_char = (char)(*((unsigned char*)aligned));
break;
case INT_SHORT:
- memcpy(&aligned, (short*)saved+j, sizeof(short));
- hw_char = (char)(*((short*)&aligned));
+ memcpy(aligned, saved+j*sizeof(short), sizeof(short));
+ hw_char = (char)(*((short*)aligned));
break;
case INT_USHORT:
- memcpy(&aligned, (unsigned short*)saved+j,
+ memcpy(aligned, saved+j*sizeof(short),
sizeof(unsigned short));
- hw_char = (char)(*((unsigned short*)&aligned));
+ hw_char = (char)(*((unsigned short*)aligned));
break;
case INT_INT:
- memcpy(&aligned, (int*)saved+j, sizeof(int));
- hw_char = (char)(*((int*)&aligned));
+ memcpy(aligned, saved+j*sizeof(int), sizeof(int));
+ hw_char = (char)(*((int*)aligned));
break;
case INT_UINT:
- memcpy(&aligned, (unsigned*)saved+j, sizeof(unsigned));
- hw_char = (char)(*((unsigned*)&aligned));
+ memcpy(aligned, saved+j*sizeof(unsigned),
+ sizeof(unsigned));
+ hw_char = (char)(*((unsigned*)aligned));
break;
case INT_LONG:
- memcpy(&aligned, (long*)saved+j, sizeof(long));
- hw_char = (char)(*((long*)&aligned));
+ memcpy(aligned, saved+j*sizeof(long), sizeof(long));
+ hw_char = (char)(*((long*)aligned));
break;
case INT_ULONG:
- memcpy(&aligned, (unsigned long*)saved+j,
+ memcpy(aligned, saved+j*sizeof(long),
sizeof(unsigned long));
- hw_char = (char)(*((unsigned long*)&aligned));
+ hw_char = (char)(*((unsigned long*)aligned));
break;
case INT_LLONG:
- memcpy(&aligned, (long_long*)saved+j, sizeof(long_long));
- hw_char = (char)(*((long_long*)&aligned));
+ memcpy(aligned, saved+j*sizeof(long_long),
+ sizeof(long_long));
+ hw_char = (char)(*((long_long*)aligned));
break;
case INT_ULLONG:
- memcpy(&aligned, (unsigned long_long*)saved+j,
+ memcpy(aligned, saved+j*sizeof(long_long),
sizeof(unsigned long_long));
- hw_char = (char)(*((unsigned long_long*)&aligned));
+ hw_char = (char)(*((unsigned long_long*)aligned));
break;
case INT_OTHER:
break;
@@ -1477,50 +1480,52 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst)
hw = (unsigned char*)&hw_uchar;
switch (src_type) {
case INT_CHAR:
- memcpy(&aligned, (signed char*)saved+j,
+ memcpy(aligned, saved+j*sizeof(char),
sizeof(signed char));
- hw_uchar = (unsigned char)(*((signed char*)&aligned));
+ hw_uchar = (unsigned char)(*((signed char*)aligned));
break;
case INT_UCHAR:
- memcpy(&aligned, (unsigned char*)saved+j,
+ memcpy(aligned, saved+j*sizeof(char),
sizeof(unsigned char));
- hw_uchar = (unsigned char)(*((unsigned char*)&aligned));
+ hw_uchar = (unsigned char)(*((unsigned char*)aligned));
break;
case INT_SHORT:
- memcpy(&aligned, (short*)saved+j, sizeof(short));
- hw_uchar = (unsigned char)(*((short*)&aligned));
+ memcpy(aligned, saved+j*sizeof(short), sizeof(short));
+ hw_uchar = (unsigned char)(*((short*)aligned));
break;
case INT_USHORT:
- memcpy(&aligned, (unsigned short*)saved+j,
+ memcpy(aligned, saved+j*sizeof(short),
sizeof(unsigned short));
- hw_uchar = (unsigned char)(*((unsigned short*)&aligned));
+ hw_uchar = (unsigned char)(*((unsigned short*)aligned));
break;
case INT_INT:
- memcpy(&aligned, (int*)saved+j, sizeof(int));
- hw_uchar = (unsigned char)(*((int*)&aligned));
+ memcpy(aligned, saved+j*sizeof(int), sizeof(int));
+ hw_uchar = (unsigned char)(*((int*)aligned));
break;
case INT_UINT:
- memcpy(&aligned, (unsigned*)saved+j, sizeof(unsigned));
- hw_uchar = (unsigned char)(*((unsigned*)&aligned));
+ memcpy(aligned, saved+j*sizeof(unsigned),
+ sizeof(unsigned));
+ hw_uchar = (unsigned char)(*((unsigned*)aligned));
break;
case INT_LONG:
- memcpy(&aligned, (long*)saved+j, sizeof(long));
- hw_uchar = (unsigned char)(*((long*)&aligned));
+ memcpy(aligned, saved+j*sizeof(long), sizeof(long));
+ hw_uchar = (unsigned char)(*((long*)aligned));
break;
case INT_ULONG:
- memcpy(&aligned, (unsigned long*)saved+j,
+ memcpy(aligned, saved+j*sizeof(long),
sizeof(unsigned long));
- hw_uchar = (unsigned char)(*((unsigned long*)&aligned));
+ hw_uchar = (unsigned char)(*((unsigned long*)aligned));
break;
case INT_LLONG:
- memcpy(&aligned, (long_long*)saved+j, sizeof(long_long));
- hw_uchar = (unsigned char)(*((long_long*)&aligned));
+ memcpy(aligned, saved+j*sizeof(long_long),
+ sizeof(long_long));
+ hw_uchar = (unsigned char)(*((long_long*)aligned));
break;
case INT_ULLONG:
- memcpy(&aligned, (unsigned long_long*)saved+j,
+ memcpy(aligned, saved+j*sizeof(long_long),
sizeof(unsigned long_long));
hw_uchar = (unsigned char)(*((unsigned long_long*)
- &aligned));
+ aligned));
break;
case INT_OTHER:
break;
@@ -1529,49 +1534,50 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst)
hw = (unsigned char*)&hw_short;
switch (src_type) {
case INT_CHAR:
- memcpy(&aligned, (signed char*)saved+j,
- sizeof(signed char));
- hw_short = (short)(*((signed char*)&aligned));
+ memcpy(aligned, saved+j*sizeof(char), sizeof(signed char));
+ hw_short = (short)(*((signed char*)aligned));
break;
case INT_UCHAR:
- memcpy(&aligned, (unsigned char*)saved+j,
+ memcpy(aligned, saved+j*sizeof(char),
sizeof(unsigned char));
- hw_short = (short)(*((unsigned char*)&aligned));
+ hw_short = (short)(*((unsigned char*)aligned));
break;
case INT_SHORT:
- memcpy(&aligned, (short*)saved+j, sizeof(short));
- hw_short = (short)(*((short*)&aligned));
+ memcpy(aligned, saved+j*sizeof(short), sizeof(short));
+ hw_short = (short)(*((short*)aligned));
break;
case INT_USHORT:
- memcpy(&aligned, (unsigned short*)saved+j,
+ memcpy(aligned, saved+j*sizeof(short),
sizeof(unsigned short));
- hw_short = (short)(*((unsigned short*)&aligned));
+ hw_short = (short)(*((unsigned short*)aligned));
break;
case INT_INT:
- memcpy(&aligned, (int*)saved+j, sizeof(int));
- hw_short = (short)(*((int*)&aligned));
+ memcpy(aligned, saved+j*sizeof(int), sizeof(int));
+ hw_short = (short)(*((int*)aligned));
break;
case INT_UINT:
- memcpy(&aligned, (unsigned*)saved+j, sizeof(unsigned));
- hw_short = (short)(*((unsigned*)&aligned));
+ memcpy(aligned, saved+j*sizeof(unsigned),
+ sizeof(unsigned));
+ hw_short = (short)(*((unsigned*)aligned));
break;
case INT_LONG:
- memcpy(&aligned, (long*)saved+j, sizeof(long));
- hw_short = (short)(*((long*)&aligned));
+ memcpy(aligned, saved+j*sizeof(long), sizeof(long));
+ hw_short = (short)(*((long*)aligned));
break;
case INT_ULONG:
- memcpy(&aligned, (unsigned long*)saved+j,
+ memcpy(aligned, saved+j*sizeof(long),
sizeof(unsigned long));
- hw_short = (short)(*((unsigned long*)&aligned));
+ hw_short = (short)(*((unsigned long*)aligned));
break;
case INT_LLONG:
- memcpy(&aligned, (long_long*)saved+j, sizeof(long_long));
- hw_short = (short)(*((long_long*)&aligned));
+ memcpy(aligned, saved+j*sizeof(long_long),
+ sizeof(long_long));
+ hw_short = (short)(*((long_long*)aligned));
break;
case INT_ULLONG:
- memcpy(&aligned, (unsigned long_long*)saved+j,
+ memcpy(aligned, saved+j*sizeof(long_long),
sizeof(unsigned long_long));
- hw_short = (short)(*((unsigned long_long*)&aligned));
+ hw_short = (short)(*((unsigned long_long*)aligned));
break;
case INT_OTHER:
break;
@@ -1580,50 +1586,51 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst)
hw = (unsigned char*)&hw_ushort;
switch (src_type) {
case INT_CHAR:
- memcpy(&aligned, (signed char*)saved+j,
- sizeof(signed char));
- hw_ushort = (unsigned short)(*((signed char*)&aligned));
+ memcpy(aligned, saved+j*sizeof(char), sizeof(signed char));
+ hw_ushort = (unsigned short)(*((signed char*)aligned));
break;
case INT_UCHAR:
- memcpy(&aligned, (unsigned char*)saved+j,
+ memcpy(aligned, saved+j*sizeof(char),
sizeof(unsigned char));
- hw_ushort = (unsigned short)(*((unsigned char*)&aligned));
+ hw_ushort = (unsigned short)(*((unsigned char*)aligned));
break;
case INT_SHORT:
- memcpy(&aligned, (short*)saved+j, sizeof(short));
- hw_ushort = (unsigned short)(*((short*)&aligned));
+ memcpy(aligned, saved+j*sizeof(short), sizeof(short));
+ hw_ushort = (unsigned short)(*((short*)aligned));
break;
case INT_USHORT:
- memcpy(&aligned, (unsigned short*)saved+j,
+ memcpy(aligned, saved+j*sizeof(short),
sizeof(unsigned short));
- hw_ushort = (unsigned short)(*((unsigned short*)&aligned));
+ hw_ushort = (unsigned short)(*((unsigned short*)aligned));
break;
case INT_INT:
- memcpy(&aligned, (int*)saved+j, sizeof(int));
- hw_ushort = (unsigned short)(*((int*)&aligned));
+ memcpy(aligned, saved+j*sizeof(int), sizeof(int));
+ hw_ushort = (unsigned short)(*((int*)aligned));
break;
case INT_UINT:
- memcpy(&aligned, (unsigned*)saved+j, sizeof(unsigned));
- hw_ushort = (unsigned short)(*((unsigned*)&aligned));
+ memcpy(aligned, saved+j*sizeof(unsigned),
+ sizeof(unsigned));
+ hw_ushort = (unsigned short)(*((unsigned*)aligned));
break;
case INT_LONG:
- memcpy(&aligned, (long*)saved+j, sizeof(long));
- hw_ushort = (unsigned short)(*((long*)&aligned));
+ memcpy(aligned, saved+j*sizeof(long), sizeof(long));
+ hw_ushort = (unsigned short)(*((long*)aligned));
break;
case INT_ULONG:
- memcpy(&aligned, (unsigned long*)saved+j,
+ memcpy(aligned, saved+j*sizeof(long),
sizeof(unsigned long));
- hw_ushort = (unsigned short)(*((unsigned long*)&aligned));
+ hw_ushort = (unsigned short)(*((unsigned long*)aligned));
break;
case INT_LLONG:
- memcpy(&aligned, (long_long*)saved+j, sizeof(long_long));
- hw_ushort = (unsigned short)(*((long_long*)&aligned));
+ memcpy(aligned, saved+j*sizeof(long_long),
+ sizeof(long_long));
+ hw_ushort = (unsigned short)(*((long_long*)aligned));
break;
case INT_ULLONG:
- memcpy(&aligned, (unsigned long_long*)saved+j,
+ memcpy(aligned, saved+j*sizeof(long_long),
sizeof(unsigned long_long));
hw_ushort = (unsigned short)(*((unsigned long_long*)
- &aligned));
+ aligned));
break;
case INT_OTHER:
break;
@@ -1632,49 +1639,50 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst)
hw = (unsigned char*)&hw_int;
switch (src_type) {
case INT_CHAR:
- memcpy(&aligned, (signed char*)saved+j,
- sizeof(signed char));
- hw_int = (int)(*((signed char*)&aligned));
+ memcpy(aligned, saved+j*sizeof(char), sizeof(signed char));
+ hw_int = (int)(*((signed char*)aligned));
break;
case INT_UCHAR:
- memcpy(&aligned, (unsigned char*)saved+j,
+ memcpy(aligned, saved+j*sizeof(char),
sizeof(unsigned char));
- hw_int = (int)(*((unsigned char*)&aligned));
+ hw_int = (int)(*((unsigned char*)aligned));
break;
case INT_SHORT:
- memcpy(&aligned, (short*)saved+j, sizeof(short));
- hw_int = (int)(*((short*)&aligned));
+ memcpy(aligned, saved+j*sizeof(short), sizeof(short));
+ hw_int = (int)(*((short*)aligned));
break;
case INT_USHORT:
- memcpy(&aligned, (unsigned short*)saved+j,
+ memcpy(aligned, saved+j*sizeof(short),
sizeof(unsigned short));
- hw_int = (int)(*((unsigned short*)&aligned));
+ hw_int = (int)(*((unsigned short*)aligned));
break;
case INT_INT:
- memcpy(&aligned, (int*)saved+j, sizeof(int));
- hw_int = (int)(*((int*)&aligned));
+ memcpy(aligned, saved+j*sizeof(int), sizeof(int));
+ hw_int = (int)(*((int*)aligned));
break;
case INT_UINT:
- memcpy(&aligned, (unsigned*)saved+j, sizeof(unsigned));
- hw_int = (int)(*((unsigned*)&aligned));
+ memcpy(aligned, saved+j*sizeof(unsigned),
+ sizeof(unsigned));
+ hw_int = (int)(*((unsigned*)aligned));
break;
case INT_LONG:
- memcpy(&aligned, (long*)saved+j, sizeof(long));
- hw_int = (int)(*((long*)&aligned));
+ memcpy(aligned, saved+j*sizeof(long), sizeof(long));
+ hw_int = (int)(*((long*)aligned));
break;
case INT_ULONG:
- memcpy(&aligned, (unsigned long*)saved+j,
+ memcpy(aligned, saved+j*sizeof(long),
sizeof(unsigned long));
- hw_int = (int)(*((unsigned long*)&aligned));
+ hw_int = (int)(*((unsigned long*)aligned));
break;
case INT_LLONG:
- memcpy(&aligned, (long_long*)saved+j, sizeof(long_long));
- hw_int = (int)(*((long_long*)&aligned));
+ memcpy(aligned, saved+j*sizeof(long_long),
+ sizeof(long_long));
+ hw_int = (int)(*((long_long*)aligned));
break;
case INT_ULLONG:
- memcpy(&aligned, (unsigned long_long*)saved+j,
+ memcpy(aligned, saved+j*sizeof(long_long),
sizeof(unsigned long_long));
- hw_int = (int)(*((unsigned long_long*)&aligned));
+ hw_int = (int)(*((unsigned long_long*)aligned));
break;
case INT_OTHER:
break;
@@ -1683,49 +1691,51 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst)
hw = (unsigned char*)&hw_uint;
switch (src_type) {
case INT_CHAR:
- memcpy(&aligned, (signed char*)saved+j,
+ memcpy(aligned, saved+j*sizeof(char),
sizeof(signed char));
- hw_uint = (unsigned int)(*((signed char*)&aligned));
+ hw_uint = (unsigned int)(*((signed char*)aligned));
break;
case INT_UCHAR:
- memcpy(&aligned, (unsigned char*)saved+j,
+ memcpy(aligned, saved+j*sizeof(char),
sizeof(unsigned char));
- hw_uint = (unsigned int)(*((unsigned char*)&aligned));
+ hw_uint = (unsigned int)(*((unsigned char*)aligned));
break;
case INT_SHORT:
- memcpy(&aligned, (short*)saved+j, sizeof(short));
- hw_uint = (unsigned int)(*((short*)&aligned));
+ memcpy(aligned, saved+j*sizeof(short), sizeof(short));
+ hw_uint = (unsigned int)(*((short*)aligned));
break;
case INT_USHORT:
- memcpy(&aligned, (unsigned short*)saved+j,
+ memcpy(aligned, saved+j*sizeof(short),
sizeof(unsigned short));
- hw_uint = (unsigned int)(*((unsigned short*)&aligned));
+ hw_uint = (unsigned int)(*((unsigned short*)aligned));
break;
case INT_INT:
- memcpy(&aligned, (int*)saved+j, sizeof(int));
- hw_uint = (unsigned int)(*((int*)&aligned));
+ memcpy(aligned, saved+j*sizeof(int), sizeof(int));
+ hw_uint = (unsigned int)(*((int*)aligned));
break;
case INT_UINT:
- memcpy(&aligned, (unsigned*)saved+j, sizeof(unsigned));
- hw_uint = (unsigned int)(*((unsigned*)&aligned));
+ memcpy(aligned, saved+j*sizeof(unsigned),
+ sizeof(unsigned));
+ hw_uint = (unsigned int)(*((unsigned*)aligned));
break;
case INT_LONG:
- memcpy(&aligned, (long*)saved+j, sizeof(long));
- hw_uint = (unsigned int)(*((long*)&aligned));
+ memcpy(aligned, saved+j*sizeof(long), sizeof(long));
+ hw_uint = (unsigned int)(*((long*)aligned));
break;
case INT_ULONG:
- memcpy(&aligned, (unsigned long*)saved+j,
+ memcpy(aligned, saved+j*sizeof(long),
sizeof(unsigned long));
- hw_uint = (unsigned int)(*((unsigned long*)&aligned));
+ hw_uint = (unsigned int)(*((unsigned long*)aligned));
break;
case INT_LLONG:
- memcpy(&aligned, (long_long*)saved+j, sizeof(long_long));
- hw_uint = (unsigned int)(*((long_long*)&aligned));
+ memcpy(aligned, saved+j*sizeof(long_long),
+ sizeof(long_long));
+ hw_uint = (unsigned int)(*((long_long*)aligned));
break;
case INT_ULLONG:
- memcpy(&aligned, (unsigned long_long*)saved+j,
+ memcpy(aligned, saved+j*sizeof(long_long),
sizeof(unsigned long_long));
- hw_uint = (unsigned int)(*((unsigned long_long*)&aligned));
+ hw_uint = (unsigned int)(*((unsigned long_long*)aligned));
break;
case INT_OTHER:
break;
@@ -1734,49 +1744,51 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst)
hw = (unsigned char*)&hw_long;
switch (src_type) {
case INT_CHAR:
- memcpy(&aligned, (signed char*)saved+j,
+ memcpy(aligned, saved+j*sizeof(char),
sizeof(signed char));
- hw_long = (long int)(*((signed char*)&aligned));
+ hw_long = (long int)(*((signed char*)aligned));
break;
case INT_UCHAR:
- memcpy(&aligned, (unsigned char*)saved+j,
+ memcpy(aligned, saved+j*sizeof(char),
sizeof(unsigned char));
- hw_long = (long int)(*((unsigned char*)&aligned));
+ hw_long = (long int)(*((unsigned char*)aligned));
break;
case INT_SHORT:
- memcpy(&aligned, (short*)saved+j, sizeof(short));
- hw_long = (long int)(*((short*)&aligned));
+ memcpy(aligned, saved+j*sizeof(short), sizeof(short));
+ hw_long = (long int)(*((short*)aligned));
break;
case INT_USHORT:
- memcpy(&aligned, (unsigned short*)saved+j,
+ memcpy(aligned, saved+j*sizeof(short),
sizeof(unsigned short));
- hw_long = (long int)(*((unsigned short*)&aligned));
+ hw_long = (long int)(*((unsigned short*)aligned));
break;
case INT_INT:
- memcpy(&aligned, (int*)saved+j, sizeof(int));
- hw_long = (long int)(*((int*)&aligned));
+ memcpy(aligned, saved+j*sizeof(int), sizeof(int));
+ hw_long = (long int)(*((int*)aligned));
break;
case INT_UINT:
- memcpy(&aligned, (unsigned*)saved+j, sizeof(unsigned));
- hw_long = (long int)(*((unsigned*)&aligned));
+ memcpy(aligned, saved+j*sizeof(unsigned),
+ sizeof(unsigned));
+ hw_long = (long int)(*((unsigned*)aligned));
break;
case INT_LONG:
- memcpy(&aligned, (long*)saved+j, sizeof(long));
- hw_long = (long int)(*((long*)&aligned));
+ memcpy(aligned, saved+j*sizeof(long), sizeof(long));
+ hw_long = (long int)(*((long*)aligned));
break;
case INT_ULONG:
- memcpy(&aligned, (unsigned long*)saved+j,
+ memcpy(aligned, saved+j*sizeof(long),
sizeof(unsigned long));
- hw_long = (long int)(*((unsigned long*)&aligned));
+ hw_long = (long int)(*((unsigned long*)aligned));
break;
case INT_LLONG:
- memcpy(&aligned, (long_long*)saved+j, sizeof(long_long));
- hw_long = (long int)(*((long_long*)&aligned));
+ memcpy(aligned, saved+j*sizeof(long_long),
+ sizeof(long_long));
+ hw_long = (long int)(*((long_long*)aligned));
break;
case INT_ULLONG:
- memcpy(&aligned, (unsigned long_long*)saved+j,
+ memcpy(aligned, saved+j*sizeof(long_long),
sizeof(unsigned long_long));
- hw_long = (long int)(*((unsigned long_long*)&aligned));
+ hw_long = (long int)(*((unsigned long_long*)aligned));
break;
case INT_OTHER:
break;
@@ -1785,50 +1797,52 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst)
hw = (unsigned char*)&hw_ulong;
switch (src_type) {
case INT_CHAR:
- memcpy(&aligned, (signed char*)saved+j,
+ memcpy(aligned, saved+j*sizeof(char),
sizeof(signed char));
- hw_ulong = (unsigned long)(*((signed char*)&aligned));
+ hw_ulong = (unsigned long)(*((signed char*)aligned));
break;
case INT_UCHAR:
- memcpy(&aligned, (unsigned char*)saved+j,
+ memcpy(aligned, saved+j*sizeof(char),
sizeof(unsigned char));
- hw_ulong = (unsigned long)(*((unsigned char*)&aligned));
+ hw_ulong = (unsigned long)(*((unsigned char*)aligned));
break;
case INT_SHORT:
- memcpy(&aligned, (short*)saved+j, sizeof(short));
- hw_ulong = (unsigned long)(*((short*)&aligned));
+ memcpy(aligned, saved+j*sizeof(short), sizeof(short));
+ hw_ulong = (unsigned long)(*((short*)aligned));
break;
case INT_USHORT:
- memcpy(&aligned, (unsigned short*)saved+j,
+ memcpy(aligned, saved+j*sizeof(short),
sizeof(unsigned short));
- hw_ulong = (unsigned long)(*((unsigned short*)&aligned));
+ hw_ulong = (unsigned long)(*((unsigned short*)aligned));
break;
case INT_INT:
- memcpy(&aligned, (int*)saved+j, sizeof(int));
- hw_ulong = (unsigned long)(*((int*)&aligned));
+ memcpy(aligned, saved+j*sizeof(int), sizeof(int));
+ hw_ulong = (unsigned long)(*((int*)aligned));
break;
case INT_UINT:
- memcpy(&aligned, (unsigned*)saved+j, sizeof(unsigned));
- hw_ulong = (unsigned long)(*((unsigned*)&aligned));
+ memcpy(aligned, saved+j*sizeof(unsigned),
+ sizeof(unsigned));
+ hw_ulong = (unsigned long)(*((unsigned*)aligned));
break;
case INT_LONG:
- memcpy(&aligned, (long*)saved+j, sizeof(long));
- hw_ulong = (unsigned long)(*((long*)&aligned));
+ memcpy(aligned, saved+j*sizeof(long), sizeof(long));
+ hw_ulong = (unsigned long)(*((long*)aligned));
break;
case INT_ULONG:
- memcpy(&aligned, (unsigned long*)saved+j,
+ memcpy(aligned, saved+j*sizeof(long),
sizeof(unsigned long));
- hw_ulong = (unsigned long)(*((unsigned long*)&aligned));
+ hw_ulong = (unsigned long)(*((unsigned long*)aligned));
break;
case INT_LLONG:
- memcpy(&aligned, (long_long*)saved+j, sizeof(long_long));
- hw_ulong = (unsigned long)(*((long_long*)&aligned));
+ memcpy(aligned, saved+j*sizeof(long_long),
+ sizeof(long_long));
+ hw_ulong = (unsigned long)(*((long_long*)aligned));
break;
case INT_ULLONG:
- memcpy(&aligned, (unsigned long_long*)saved+j,
+ memcpy(aligned, saved+j*sizeof(long_long),
sizeof(unsigned long_long));
hw_ulong = (unsigned long)(*((unsigned long_long*)
- &aligned));
+ aligned));
break;
case INT_OTHER:
break;
@@ -1837,49 +1851,51 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst)
hw = (unsigned char*)&hw_llong;
switch (src_type) {
case INT_CHAR:
- memcpy(&aligned, (signed char*)saved+j,
+ memcpy(aligned, saved+j*sizeof(char),
sizeof(signed char));
- hw_llong = (long_long)(*((signed char*)&aligned));
+ hw_llong = (long_long)(*((signed char*)aligned));
break;
case INT_UCHAR:
- memcpy(&aligned, (unsigned char*)saved+j,
+ memcpy(aligned, saved+j*sizeof(char),
sizeof(unsigned char));
- hw_llong = (long_long)(*((unsigned char*)&aligned));
+ hw_llong = (long_long)(*((unsigned char*)aligned));
break;
case INT_SHORT:
- memcpy(&aligned, (short*)saved+j, sizeof(short));
- hw_llong = (long_long)(*((short*)&aligned));
+ memcpy(aligned, saved+j*sizeof(short), sizeof(short));
+ hw_llong = (long_long)(*((short*)aligned));
break;
case INT_USHORT:
- memcpy(&aligned, (unsigned short*)saved+j,
+ memcpy(aligned, saved+j*sizeof(short),
sizeof(unsigned short));
- hw_llong = (long_long)(*((unsigned short*)&aligned));
+ hw_llong = (long_long)(*((unsigned short*)aligned));
break;
case INT_INT:
- memcpy(&aligned, (int*)saved+j, sizeof(int));
- hw_llong = (long_long)(*((int*)&aligned));
+ memcpy(aligned, saved+j*sizeof(int), sizeof(int));
+ hw_llong = (long_long)(*((int*)aligned));
break;
case INT_UINT:
- memcpy(&aligned, (unsigned*)saved+j, sizeof(unsigned));
- hw_llong = (long_long)(*((unsigned*)&aligned));
+ memcpy(aligned, saved+j*sizeof(unsigned),
+ sizeof(unsigned));
+ hw_llong = (long_long)(*((unsigned*)aligned));
break;
case INT_LONG:
- memcpy(&aligned, (long*)saved+j, sizeof(long));
- hw_llong = (long_long)(*((long*)&aligned));
+ memcpy(aligned, saved+j*sizeof(long), sizeof(long));
+ hw_llong = (long_long)(*((long*)aligned));
break;
case INT_ULONG:
- memcpy(&aligned, (unsigned long*)saved+j,
+ memcpy(aligned, saved+j*sizeof(long),
sizeof(unsigned long));
- hw_llong = (long_long)(*((unsigned long*)&aligned));
+ hw_llong = (long_long)(*((unsigned long*)aligned));
break;
case INT_LLONG:
- memcpy(&aligned, (long_long*)saved+j, sizeof(long_long));
- hw_llong = (long_long)(*((long_long*)&aligned));
+ memcpy(aligned, saved+j*sizeof(long_long),
+ sizeof(long_long));
+ hw_llong = (long_long)(*((long_long*)aligned));
break;
case INT_ULLONG:
- memcpy(&aligned, (unsigned long_long*)saved+j,
+ memcpy(aligned, saved+j*sizeof(long_long),
sizeof(unsigned long_long));
- hw_llong = (long_long)(*((unsigned long_long*)&aligned));
+ hw_llong = (long_long)(*((unsigned long_long*)aligned));
break;
case INT_OTHER:
break;
@@ -1888,54 +1904,56 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst)
hw = (unsigned char*)&hw_ullong;
switch (src_type) {
case INT_CHAR:
- memcpy(&aligned, (signed char*)saved+j,
+ memcpy(aligned, saved+j*sizeof(char),
sizeof(signed char));
hw_ullong = (unsigned long_long)(*((signed char*)
- &aligned));
+ aligned));
break;
case INT_UCHAR:
- memcpy(&aligned, (unsigned char*)saved+j,
+ memcpy(aligned, saved+j*sizeof(char),
sizeof(unsigned char));
hw_ullong = (unsigned long_long)(*((unsigned char*)
- &aligned));
+ aligned));
break;
case INT_SHORT:
- memcpy(&aligned, (short*)saved+j, sizeof(short));
- hw_ullong = (unsigned long_long)(*((short*)&aligned));
+ memcpy(aligned, saved+j*sizeof(short), sizeof(short));
+ hw_ullong = (unsigned long_long)(*((short*)aligned));
break;
case INT_USHORT:
- memcpy(&aligned, (unsigned short*)saved+j,
+ memcpy(aligned, saved+j*sizeof(short),
sizeof(unsigned short));
hw_ullong = (unsigned long_long)(*((unsigned short*)
- &aligned));
+ aligned));
break;
case INT_INT:
- memcpy(&aligned, (int*)saved+j, sizeof(int));
- hw_ullong = (unsigned long_long)(*((int*)&aligned));
+ memcpy(aligned, saved+j*sizeof(int), sizeof(int));
+ hw_ullong = (unsigned long_long)(*((int*)aligned));
break;
case INT_UINT:
- memcpy(&aligned, (unsigned*)saved+j, sizeof(unsigned));
- hw_ullong = (unsigned long_long)(*((unsigned*)&aligned));
+ memcpy(aligned, saved+j*sizeof(unsigned),
+ sizeof(unsigned));
+ hw_ullong = (unsigned long_long)(*((unsigned*)aligned));
break;
case INT_LONG:
- memcpy(&aligned, (long*)saved+j, sizeof(long));
- hw_ullong = (unsigned long_long)(*((long*)&aligned));
+ memcpy(aligned, saved+j*sizeof(long), sizeof(long));
+ hw_ullong = (unsigned long_long)(*((long*)aligned));
break;
case INT_ULONG:
- memcpy(&aligned, (unsigned long*)saved+j,
+ memcpy(aligned, saved+j*sizeof(long),
sizeof(unsigned long));
hw_ullong = (unsigned long_long)(*((unsigned long*)
- &aligned));
+ aligned));
break;
case INT_LLONG:
- memcpy(&aligned, (long_long*)saved+j, sizeof(long_long));
- hw_ullong = (unsigned long_long)(*((long_long*)&aligned));
+ memcpy(aligned, saved+j*sizeof(long_long),
+ sizeof(long_long));
+ hw_ullong = (unsigned long_long)(*((long_long*)aligned));
break;
case INT_ULLONG:
- memcpy(&aligned, (unsigned long_long*)saved+j,
+ memcpy(aligned, saved+j*sizeof(long_long),
sizeof(unsigned long_long));
hw_ullong = (unsigned long_long)(*((unsigned long_long*)
- &aligned));
+ aligned));
break;
case INT_OTHER:
break;
@@ -2073,49 +2091,47 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst)
printf("%*s", 3*MAX(0, (ssize_t)dst_size-(ssize_t)src_size), "");
switch (src_type) {
case INT_CHAR:
- memcpy(&aligned, (signed char*)saved+j, sizeof(signed char));
- printf(" %29d\n", *((signed char*)&aligned));
+ memcpy(aligned, saved+j*sizeof(char), sizeof(signed char));
+ printf(" %29d\n", *((signed char*)aligned));
break;
case INT_UCHAR:
- memcpy(&aligned, (unsigned char*)saved+j,
- sizeof(unsigned char));
- printf(" %29u\n", *((unsigned char*)&aligned));
+ memcpy(aligned, saved+j*sizeof(char), sizeof(unsigned char));
+ printf(" %29u\n", *((unsigned char*)aligned));
break;
case INT_SHORT:
- memcpy(&aligned, (short*)saved+j, sizeof(short));
- printf(" %29d\n", *((short*)&aligned));
+ memcpy(aligned, saved+j*sizeof(short), sizeof(short));
+ printf(" %29d\n", *((short*)aligned));
break;
case INT_USHORT:
- memcpy(&aligned, (unsigned short*)saved+j,
+ memcpy(aligned, saved+j*sizeof(short),
sizeof(unsigned short));
- printf(" %29u\n", *((unsigned short*)&aligned));
+ printf(" %29u\n", *((unsigned short*)aligned));
break;
case INT_INT:
- memcpy(&aligned, (int*)saved+j, sizeof(int));
- printf(" %29d\n", *((int*)&aligned));
+ memcpy(aligned, saved+j*sizeof(int), sizeof(int));
+ printf(" %29d\n", *((int*)aligned));
break;
case INT_UINT:
- memcpy(&aligned, (unsigned*)saved+j, sizeof(unsigned));
- printf(" %29u\n", *((unsigned*)&aligned));
+ memcpy(aligned, saved+j*sizeof(unsigned), sizeof(unsigned));
+ printf(" %29u\n", *((unsigned*)aligned));
break;
case INT_LONG:
- memcpy(&aligned, (long*)saved+j, sizeof(long));
- printf(" %29ld\n", *((long*)&aligned));
+ memcpy(aligned, saved+j*sizeof(long), sizeof(long));
+ printf(" %29ld\n", *((long*)aligned));
break;
case INT_ULONG:
- memcpy(&aligned, (unsigned long*)saved+j,
- sizeof(unsigned long));
- printf(" %29lu\n", *((unsigned long*)&aligned));
+ memcpy(aligned, saved+j*sizeof(long), sizeof(unsigned long));
+ printf(" %29lu\n", *((unsigned long*)aligned));
break;
case INT_LLONG:
- memcpy(&aligned, (long_long*)saved+j, sizeof(long_long));
- printf(" %29"PRINTF_LL_WIDTH"d\n", *((long_long*)&aligned));
+ memcpy(aligned, saved+j*sizeof(long_long), sizeof(long_long));
+ printf(" %29"PRINTF_LL_WIDTH"d\n", *((long_long*)aligned));
break;
case INT_ULLONG:
- memcpy(&aligned, (unsigned long_long*)saved+j,
+ memcpy(aligned, saved+j*sizeof(long_long),
sizeof(unsigned long_long));
printf(" %29"PRINTF_LL_WIDTH"u\n",
- *((unsigned long_long*)&aligned));
+ *((unsigned long_long*)aligned));
break;
case INT_OTHER:
break;
@@ -2128,49 +2144,46 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst)
printf("%*s", 3*MAX(0, (ssize_t)src_size-(ssize_t)dst_size), "");
switch (dst_type) {
case INT_CHAR:
- memcpy(&aligned, (signed char*)saved+j, sizeof(signed char));
- printf(" %29d\n", *((signed char*)&aligned));
+ memcpy(aligned, saved+j*sizeof(char), sizeof(signed char));
+ printf(" %29d\n", *((signed char*)aligned));
break;
case INT_UCHAR:
- memcpy(&aligned, (unsigned char*)saved+j,
- sizeof(unsigned char));
- printf(" %29u\n", *((unsigned char*)&aligned));
+ memcpy(aligned, saved+j*sizeof(char), sizeof(unsigned char));
+ printf(" %29u\n", *((unsigned char*)aligned));
break;
case INT_SHORT:
- memcpy(&aligned, (short*)saved+j, sizeof(short));
- printf(" %29d\n", *((short*)&aligned));
+ memcpy(aligned, saved+j*sizeof(short), sizeof(short));
+ printf(" %29d\n", *((short*)aligned));
break;
case INT_USHORT:
- memcpy(&aligned, (unsigned short*)saved+j,
- sizeof(unsigned short));
- printf(" %29u\n", *((unsigned short*)&aligned));
+ memcpy(aligned, saved+j*sizeof(short), sizeof(unsigned short));
+ printf(" %29u\n", *((unsigned short*)aligned));
break;
case INT_INT:
- memcpy(&aligned, (int*)saved+j, sizeof(int));
- printf(" %29d\n", *((int*)&aligned));
+ memcpy(aligned, saved+j*sizeof(int), sizeof(int));
+ printf(" %29d\n", *((int*)aligned));
break;
case INT_UINT:
- memcpy(&aligned, (unsigned*)saved+j, sizeof(unsigned));
- printf(" %29u\n", *((unsigned*)&aligned));
+ memcpy(aligned, saved+j*sizeof(unsigned), sizeof(unsigned));
+ printf(" %29u\n", *((unsigned*)aligned));
break;
case INT_LONG:
- memcpy(&aligned, (long*)saved+j, sizeof(long));
- printf(" %29ld\n", *((long*)&aligned));
+ memcpy(aligned, saved+j*sizeof(long), sizeof(long));
+ printf(" %29ld\n", *((long*)aligned));
break;
case INT_ULONG:
- memcpy(&aligned, (unsigned long*)saved+j,
- sizeof(unsigned long));
- printf(" %29lu\n", *((unsigned long*)&aligned));
+ memcpy(aligned, saved+j*sizeof(long), sizeof(unsigned long));
+ printf(" %29lu\n", *((unsigned long*)aligned));
break;
case INT_LLONG:
- memcpy(&aligned, (long_long*)saved+j, sizeof(long_long));
- printf(" %29"PRINTF_LL_WIDTH"d\n", *((long_long*)&aligned));
+ memcpy(aligned, saved+j*sizeof(long_long), sizeof(long_long));
+ printf(" %29"PRINTF_LL_WIDTH"d\n", *((long_long*)aligned));
break;
case INT_ULLONG:
- memcpy(&aligned, (unsigned long_long*)saved+j,
+ memcpy(aligned, saved+j*sizeof(long_long),
sizeof(unsigned long_long));
printf(" %29"PRINTF_LL_WIDTH"u\n",
- *((unsigned long_long*)&aligned));
+ *((unsigned long_long*)aligned));
break;
case INT_OTHER:
break;
@@ -2233,6 +2246,7 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst)
done:
if (buf) aligned_free(buf);
if (saved) aligned_free(saved);
+ if (aligned) free(aligned);
fflush(stdout);
reset_hdf5(); /*print statistics*/
return (int)fails_all_tests;
@@ -2240,6 +2254,7 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst)
error:
if (buf) aligned_free(buf);
if (saved) aligned_free(saved);
+ if (aligned) free(aligned);
fflush(stdout);
reset_hdf5(); /*print statistics*/
return MAX((int)fails_all_tests, 1);
@@ -2350,11 +2365,9 @@ test_conv_flt_1 (const char *name, hid_t src, hid_t dst)
char str[256]; /*hello string */
float hw_f; /*hardware-converted */
double hw_d; /*hardware-converted */
+ void *aligned=NULL; /*aligned buffer */
#if SIZEOF_LONG_DOUBLE!=SIZEOF_DOUBLE
long double hw_ld; /*hardware-converted */
- long double aligned; /*aligned value */
-#else
- double aligned; /*aligned value */
#endif
unsigned char *hw=NULL; /*ptr to hardware-conv'd*/
size_t i, j, k; /*counters */
@@ -2444,6 +2457,7 @@ test_conv_flt_1 (const char *name, hid_t src, hid_t dst)
dst_size = H5Tget_size(dst);
buf = aligned_malloc(nelmts*MAX(src_size, dst_size));
saved = aligned_malloc(nelmts*MAX(src_size, dst_size));
+ aligned = malloc(16); /*should be big enough for any type*/
#ifdef SHOW_OVERFLOWS
noverflows_g = 0;
#endif
@@ -2516,44 +2530,45 @@ test_conv_flt_1 (const char *name, hid_t src, hid_t dst)
/* The hardware conversion */
if (FLT_FLOAT==src_type) {
- memcpy(&aligned, (float*)saved+j, sizeof(float));
+ memcpy(aligned, saved+j*sizeof(float), sizeof(float));
if (FLT_FLOAT==dst_type) {
- hw_f = *((float*)&aligned);
+ hw_f = *((float*)aligned);
hw = (unsigned char*)&hw_f;
} else if (FLT_DOUBLE==dst_type) {
- hw_d = *((float*)&aligned);
+ hw_d = *((float*)aligned);
hw = (unsigned char*)&hw_d;
#if SIZEOF_LONG_DOUBLE!=SIZEOF_DOUBLE
} else {
- hw_ld = *((float*)&aligned);
+ hw_ld = *((float*)aligned);
hw = (unsigned char*)&hw_ld;
#endif
}
} else if (FLT_DOUBLE==src_type) {
- memcpy(&aligned, (double*)saved+j, sizeof(double));
+ memcpy(aligned, saved+j*sizeof(double), sizeof(double));
if (FLT_FLOAT==dst_type) {
- hw_f = *((double*)&aligned);
+ hw_f = *((double*)aligned);
hw = (unsigned char*)&hw_f;
} else if (FLT_DOUBLE==dst_type) {
- hw_d = *((double*)&aligned);
+ hw_d = *((double*)aligned);
hw = (unsigned char*)&hw_d;
#if SIZEOF_LONG_DOUBLE!=SIZEOF_DOUBLE
} else {
- hw_ld = *((double*)&aligned);
+ hw_ld = *((double*)aligned);
hw = (unsigned char*)&hw_ld;
#endif
}
#if SIZEOF_LONG_DOUBLE!=SIZEOF_DOUBLE
} else {
- memcpy(&aligned, (long double*)saved+j, sizeof(long double));
+ memcpy(aligned, saved+j*sizeof(long double),
+ sizeof(long double));
if (FLT_FLOAT==dst_type) {
- hw_f = *((long double*)&aligned);
+ hw_f = *((long double*)aligned);
hw = (unsigned char*)&hw_f;
} else if (FLT_DOUBLE==dst_type) {
- hw_d = *((long double*)&aligned);
+ hw_d = *((long double*)aligned);
hw = (unsigned char*)&hw_d;
} else {
- hw_ld = *((long double*)&aligned);
+ hw_ld = *((long double*)aligned);
hw = (unsigned char*)&hw_ld;
}
#endif
@@ -2709,8 +2724,9 @@ test_conv_flt_1 (const char *name, hid_t src, hid_t dst)
#endif
done:
- if (buf) aligned_free (buf);
- if (saved) aligned_free (saved);
+ if (buf) aligned_free(buf);
+ if (saved) aligned_free(saved);
+ if (aligned) free(aligned);
fflush(stdout);
#ifdef HANDLE_SIGFPE
exit(MIN((int)fails_all_tests, 254));
@@ -2720,8 +2736,9 @@ test_conv_flt_1 (const char *name, hid_t src, hid_t dst)
#endif
error:
- if (buf) aligned_free (buf);
- if (saved) aligned_free (saved);
+ if (buf) aligned_free(buf);
+ if (saved) aligned_free(saved);
+ if (aligned) free(aligned);
fflush(stdout);
#ifdef HANDLE_SIGFPE
exit(MIN(MAX((int)fails_all_tests, 1), 254));
diff --git a/test/hyperslab.c b/test/hyperslab.c
index 6fdfaa5..01e092c 100644
--- a/test/hyperslab.c
+++ b/test/hyperslab.c
@@ -284,7 +284,7 @@ test_fill(size_t nx, size_t ny, size_t nz,
* Purpose: Tests H5V_hyper_copy().
*
* The NX, NY, and NZ arguments are the size for the source and
- * destination arrays. You map pass zero for NZ or for NY and
+ * destination arrays. You may pass zero for NZ or for NY and
* NZ to test the 2-d and 1-d cases respectively.
*
* A hyperslab is copied from/to (depending on MODE) various
@@ -384,12 +384,12 @@ test_copy(int mode,
dst = H5MM_calloc(nx*ny*nz);
init_full(src, nx, ny, nz);
- for (i = 0; i < nx; i += di) {
- for (j = 0; j < ny; j += dj) {
- for (k = 0; k < nz; k += dk) {
- for (dx = 1; dx <= nx - i; dx += ddx) {
- for (dy = 1; dy <= ny - j; dy += ddy) {
- for (dz = 1; dz <= nz - k; dz += ddz) {
+ for (i=0; i<nx; i+=di) {
+ for (j=0; j<ny; j+=dj) {
+ for (k=0; k<nz; k+=dk) {
+ for (dx=1; dx<=nx-i; dx+=ddx) {
+ for (dy=1; dy<=ny-j; dy+=ddy) {
+ for (dz=1; dz<=nz-k; dz+=ddz) {
/*
* Describe the source and destination hyperslabs
@@ -451,10 +451,10 @@ test_copy(int mode,
* Set all loc values to 1 so we can detect writing
* outside the hyperslab.
*/
- for (u = 0; u < nx; u++) {
- for (v = 0; v < ny; v++) {
- for (w = 0; w < nz; w++) {
- dst[u * ny * nz + v * nz + w] = 1;
+ for (u=0; u<nx; u++) {
+ for (v=0; v<ny; v++) {
+ for (w=0; w<nz; w++) {
+ dst[u*ny*nz + v*nz + w] = 1;
}
}
}
@@ -476,10 +476,10 @@ test_copy(int mode,
for (v=dst_offset[1];
v<dst_offset[1]+dy;
v++) {
- for (w = dst_offset[2];
- w < dst_offset[2] + dz;
+ for (w=dst_offset[2];
+ w<dst_offset[2]+dz;
w++) {
- acc += dst[u * ny * nz + v * nz + w];
+ acc += dst[u*ny*nz + v*nz + w];
}
}
}
@@ -512,14 +512,21 @@ test_copy(int mode,
* we added the border of 1's to the hyperslab.
*/
acc = 0;
- for (u = 0; u < nx; u++) {
- for (v = 0; v < ny; v++) {
- for (w = 0; w < nz; w++) {
- acc += dst[u * ny * nz + v * nz + w];
+ for (u=0; u<nx; u++) {
+ for (v=0; v<ny; v++) {
+ for (w=0; w<nz; w++) {
+ acc += dst[u*ny*nz + v*nz + w];
}
}
}
- if (acc != ref_value + nx*ny*nz - dx*dy*dz) {
+
+ /*
+ * The following casts are to work around an
+ * optimization bug in the Mongoose 7.20 Irix64
+ * compiler.
+ */
+ if (acc+(unsigned)dx*(unsigned)dy*(unsigned)dz !=
+ ref_value + nx*ny*nz) {
puts("*FAILED*");
if (!isatty(1)) {
/*
generated by cgit v0.12 at 2024-11-02 15:19:21 (GMT)