From 263bfa76ef70a96d195527b0063a929f2b57b78a Mon Sep 17 00:00:00 2001 From: Robb Matzke Date: Fri, 11 Jun 1999 10:53:15 -0500 Subject: [svn-r1328] Changes since 19990608 ---------------------- ./configure.in ./configure [REGENERATED] ./src/H5T.c ./src/H5Tpkg.h ./src/H5Tpublic.h ./src/H5config.h.in [REGENERATED] ./src/H5detect.c ./src/H5private.h Added checks for the C9x integer types like int32_t, int_least32_t, and int_fast32_t and the unsigned versions. HDF5 defines H5T_NATIVE_* versions (all caps) to be the same as the type provided by the C library, otherwise it defines them as integers exactly the specified size. Hardware type conversion functions are used when the types match some C-language type (like `int'). --- configure | 933 +++++++++++++++++++++++++++++++++++++++++++++--------- configure.in | 39 ++- src/H5T.c | 253 ++++++++++++++- src/H5Tpkg.h | 29 ++ src/H5Tpublic.h | 55 +++- src/H5config.h.in | 51 +++ src/H5detect.c | 117 +++++-- src/H5private.h | 7 + 8 files changed, 1284 insertions(+), 200 deletions(-) diff --git a/configure b/configure index 70c01a3..06eeadd 100755 --- a/configure +++ b/configure @@ -1751,7 +1751,7 @@ else fi done -for ac_hdr in stddef.h setjmp.h +for ac_hdr in stddef.h setjmp.h stdint.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 @@ -2499,8 +2499,165 @@ cat >> confdefs.h <&6 +echo "configure:2504: checking size of int_least8_t" >&5 +if eval "test \"`echo '$''{'ac_cv_sizeof_int_least8_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test "$cross_compiling" = yes; then + ac_cv_sizeof_int_least8_t=1 +else + cat > conftest.$ac_ext < +main() +{ + FILE *f=fopen("conftestval", "w"); + if (!f) exit(1); + fprintf(f, "%d\n", sizeof(int_least8_t)); + exit(0); +} +EOF +if { (eval echo configure:2523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +then + ac_cv_sizeof_int_least8_t=`cat conftestval` +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + ac_cv_sizeof_int_least8_t=0 +fi +rm -fr conftest* +fi + +fi +echo "$ac_t""$ac_cv_sizeof_int_least8_t" 1>&6 +cat >> confdefs.h <&6 +echo "configure:2543: checking size of uint_least8_t" >&5 +if eval "test \"`echo '$''{'ac_cv_sizeof_uint_least8_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test "$cross_compiling" = yes; then + ac_cv_sizeof_uint_least8_t=1 +else + cat > conftest.$ac_ext < +main() +{ + FILE *f=fopen("conftestval", "w"); + if (!f) exit(1); + fprintf(f, "%d\n", sizeof(uint_least8_t)); + exit(0); +} +EOF +if { (eval echo configure:2562: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +then + ac_cv_sizeof_uint_least8_t=`cat conftestval` +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + ac_cv_sizeof_uint_least8_t=0 +fi +rm -fr conftest* +fi + +fi +echo "$ac_t""$ac_cv_sizeof_uint_least8_t" 1>&6 +cat >> confdefs.h <&6 +echo "configure:2582: checking size of int_fast8_t" >&5 +if eval "test \"`echo '$''{'ac_cv_sizeof_int_fast8_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test "$cross_compiling" = yes; then + ac_cv_sizeof_int_fast8_t=1 +else + cat > conftest.$ac_ext < +main() +{ + FILE *f=fopen("conftestval", "w"); + if (!f) exit(1); + fprintf(f, "%d\n", sizeof(int_fast8_t)); + exit(0); +} +EOF +if { (eval echo configure:2601: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +then + ac_cv_sizeof_int_fast8_t=`cat conftestval` +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + ac_cv_sizeof_int_fast8_t=0 +fi +rm -fr conftest* +fi + +fi +echo "$ac_t""$ac_cv_sizeof_int_fast8_t" 1>&6 +cat >> confdefs.h <&6 +echo "configure:2621: checking size of uint_fast8_t" >&5 +if eval "test \"`echo '$''{'ac_cv_sizeof_uint_fast8_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test "$cross_compiling" = yes; then + ac_cv_sizeof_uint_fast8_t=1 +else + cat > conftest.$ac_ext < +main() +{ + FILE *f=fopen("conftestval", "w"); + if (!f) exit(1); + fprintf(f, "%d\n", sizeof(uint_fast8_t)); + exit(0); +} +EOF +if { (eval echo configure:2640: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +then + ac_cv_sizeof_uint_fast8_t=`cat conftestval` +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + ac_cv_sizeof_uint_fast8_t=0 +fi +rm -fr conftest* +fi + +fi +echo "$ac_t""$ac_cv_sizeof_uint_fast8_t" 1>&6 +cat >> confdefs.h <&6 -echo "configure:2504: checking size of int16_t" >&5 +echo "configure:2661: 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 @@ -2508,7 +2665,7 @@ else ac_cv_sizeof_int16_t=2 else cat > conftest.$ac_ext < main() @@ -2519,7 +2676,7 @@ main() exit(0); } EOF -if { (eval echo configure:2523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2680: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int16_t=`cat conftestval` else @@ -2539,7 +2696,7 @@ EOF echo $ac_n "checking size of uint16_t""... $ac_c" 1>&6 -echo "configure:2543: checking size of uint16_t" >&5 +echo "configure:2700: 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 @@ -2547,7 +2704,7 @@ else ac_cv_sizeof_uint16_t=2 else cat > conftest.$ac_ext < main() @@ -2558,7 +2715,7 @@ main() exit(0); } EOF -if { (eval echo configure:2562: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2719: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_uint16_t=`cat conftestval` else @@ -2577,8 +2734,165 @@ cat >> confdefs.h <&6 +echo "configure:2739: checking size of int_least16_t" >&5 +if eval "test \"`echo '$''{'ac_cv_sizeof_int_least16_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test "$cross_compiling" = yes; then + ac_cv_sizeof_int_least16_t=2 +else + cat > conftest.$ac_ext < +main() +{ + FILE *f=fopen("conftestval", "w"); + if (!f) exit(1); + fprintf(f, "%d\n", sizeof(int_least16_t)); + exit(0); +} +EOF +if { (eval echo configure:2758: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +then + ac_cv_sizeof_int_least16_t=`cat conftestval` +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + ac_cv_sizeof_int_least16_t=0 +fi +rm -fr conftest* +fi + +fi +echo "$ac_t""$ac_cv_sizeof_int_least16_t" 1>&6 +cat >> confdefs.h <&6 +echo "configure:2778: checking size of uint_least16_t" >&5 +if eval "test \"`echo '$''{'ac_cv_sizeof_uint_least16_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test "$cross_compiling" = yes; then + ac_cv_sizeof_uint_least16_t=2 +else + cat > conftest.$ac_ext < +main() +{ + FILE *f=fopen("conftestval", "w"); + if (!f) exit(1); + fprintf(f, "%d\n", sizeof(uint_least16_t)); + exit(0); +} +EOF +if { (eval echo configure:2797: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +then + ac_cv_sizeof_uint_least16_t=`cat conftestval` +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + ac_cv_sizeof_uint_least16_t=0 +fi +rm -fr conftest* +fi + +fi +echo "$ac_t""$ac_cv_sizeof_uint_least16_t" 1>&6 +cat >> confdefs.h <&6 +echo "configure:2817: checking size of int_fast16_t" >&5 +if eval "test \"`echo '$''{'ac_cv_sizeof_int_fast16_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test "$cross_compiling" = yes; then + ac_cv_sizeof_int_fast16_t=2 +else + cat > conftest.$ac_ext < +main() +{ + FILE *f=fopen("conftestval", "w"); + if (!f) exit(1); + fprintf(f, "%d\n", sizeof(int_fast16_t)); + exit(0); +} +EOF +if { (eval echo configure:2836: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +then + ac_cv_sizeof_int_fast16_t=`cat conftestval` +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + ac_cv_sizeof_int_fast16_t=0 +fi +rm -fr conftest* +fi + +fi +echo "$ac_t""$ac_cv_sizeof_int_fast16_t" 1>&6 +cat >> confdefs.h <&6 +echo "configure:2856: checking size of uint_fast16_t" >&5 +if eval "test \"`echo '$''{'ac_cv_sizeof_uint_fast16_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test "$cross_compiling" = yes; then + ac_cv_sizeof_uint_fast16_t=2 +else + cat > conftest.$ac_ext < +main() +{ + FILE *f=fopen("conftestval", "w"); + if (!f) exit(1); + fprintf(f, "%d\n", sizeof(uint_fast16_t)); + exit(0); +} +EOF +if { (eval echo configure:2875: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +then + ac_cv_sizeof_uint_fast16_t=`cat conftestval` +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + ac_cv_sizeof_uint_fast16_t=0 +fi +rm -fr conftest* +fi + +fi +echo "$ac_t""$ac_cv_sizeof_uint_fast16_t" 1>&6 +cat >> confdefs.h <&6 -echo "configure:2582: checking size of int32_t" >&5 +echo "configure:2896: 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 @@ -2586,7 +2900,7 @@ else ac_cv_sizeof_int32_t=4 else cat > conftest.$ac_ext < main() @@ -2597,7 +2911,7 @@ main() exit(0); } EOF -if { (eval echo configure:2601: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int32_t=`cat conftestval` else @@ -2617,7 +2931,7 @@ EOF echo $ac_n "checking size of uint32_t""... $ac_c" 1>&6 -echo "configure:2621: checking size of uint32_t" >&5 +echo "configure:2935: 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 @@ -2625,7 +2939,7 @@ else ac_cv_sizeof_uint32_t=4 else cat > conftest.$ac_ext < main() @@ -2636,7 +2950,7 @@ main() exit(0); } EOF -if { (eval echo configure:2640: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2954: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_uint32_t=`cat conftestval` else @@ -2655,8 +2969,165 @@ cat >> confdefs.h <&6 +echo "configure:2974: checking size of int_least32_t" >&5 +if eval "test \"`echo '$''{'ac_cv_sizeof_int_least32_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test "$cross_compiling" = yes; then + ac_cv_sizeof_int_least32_t=4 +else + cat > conftest.$ac_ext < +main() +{ + FILE *f=fopen("conftestval", "w"); + if (!f) exit(1); + fprintf(f, "%d\n", sizeof(int_least32_t)); + exit(0); +} +EOF +if { (eval echo configure:2993: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +then + ac_cv_sizeof_int_least32_t=`cat conftestval` +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + ac_cv_sizeof_int_least32_t=0 +fi +rm -fr conftest* +fi + +fi +echo "$ac_t""$ac_cv_sizeof_int_least32_t" 1>&6 +cat >> confdefs.h <&6 +echo "configure:3013: checking size of uint_least32_t" >&5 +if eval "test \"`echo '$''{'ac_cv_sizeof_uint_least32_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test "$cross_compiling" = yes; then + ac_cv_sizeof_uint_least32_t=4 +else + cat > conftest.$ac_ext < +main() +{ + FILE *f=fopen("conftestval", "w"); + if (!f) exit(1); + fprintf(f, "%d\n", sizeof(uint_least32_t)); + exit(0); +} +EOF +if { (eval echo configure:3032: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +then + ac_cv_sizeof_uint_least32_t=`cat conftestval` +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + ac_cv_sizeof_uint_least32_t=0 +fi +rm -fr conftest* +fi + +fi +echo "$ac_t""$ac_cv_sizeof_uint_least32_t" 1>&6 +cat >> confdefs.h <&6 +echo "configure:3052: checking size of int_fast32_t" >&5 +if eval "test \"`echo '$''{'ac_cv_sizeof_int_fast32_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test "$cross_compiling" = yes; then + ac_cv_sizeof_int_fast32_t=4 +else + cat > conftest.$ac_ext < +main() +{ + FILE *f=fopen("conftestval", "w"); + if (!f) exit(1); + fprintf(f, "%d\n", sizeof(int_fast32_t)); + exit(0); +} +EOF +if { (eval echo configure:3071: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +then + ac_cv_sizeof_int_fast32_t=`cat conftestval` +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + ac_cv_sizeof_int_fast32_t=0 +fi +rm -fr conftest* +fi + +fi +echo "$ac_t""$ac_cv_sizeof_int_fast32_t" 1>&6 +cat >> confdefs.h <&6 +echo "configure:3091: checking size of uint_fast32_t" >&5 +if eval "test \"`echo '$''{'ac_cv_sizeof_uint_fast32_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test "$cross_compiling" = yes; then + ac_cv_sizeof_uint_fast32_t=4 +else + cat > conftest.$ac_ext < +main() +{ + FILE *f=fopen("conftestval", "w"); + if (!f) exit(1); + fprintf(f, "%d\n", sizeof(uint_fast32_t)); + exit(0); +} +EOF +if { (eval echo configure:3110: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +then + ac_cv_sizeof_uint_fast32_t=`cat conftestval` +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + ac_cv_sizeof_uint_fast32_t=0 +fi +rm -fr conftest* +fi + +fi +echo "$ac_t""$ac_cv_sizeof_uint_fast32_t" 1>&6 +cat >> confdefs.h <&6 -echo "configure:2660: checking size of int64_t" >&5 +echo "configure:3131: 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 @@ -2664,7 +3135,7 @@ else ac_cv_sizeof_int64_t=8 else cat > conftest.$ac_ext < main() @@ -2675,7 +3146,7 @@ main() exit(0); } EOF -if { (eval echo configure:2679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3150: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int64_t=`cat conftestval` else @@ -2695,7 +3166,7 @@ EOF echo $ac_n "checking size of uint64_t""... $ac_c" 1>&6 -echo "configure:2699: checking size of uint64_t" >&5 +echo "configure:3170: 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 @@ -2703,7 +3174,7 @@ else ac_cv_sizeof_uint64_t=8 else cat > conftest.$ac_ext < main() @@ -2714,7 +3185,7 @@ main() exit(0); } EOF -if { (eval echo configure:2718: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3189: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_uint64_t=`cat conftestval` else @@ -2733,9 +3204,165 @@ cat >> confdefs.h <&6 +echo "configure:3209: checking size of int_least64_t" >&5 +if eval "test \"`echo '$''{'ac_cv_sizeof_int_least64_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test "$cross_compiling" = yes; then + ac_cv_sizeof_int_least64_t=8 +else + cat > conftest.$ac_ext < +main() +{ + FILE *f=fopen("conftestval", "w"); + if (!f) exit(1); + fprintf(f, "%d\n", sizeof(int_least64_t)); + exit(0); +} +EOF +if { (eval echo configure:3228: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +then + ac_cv_sizeof_int_least64_t=`cat conftestval` +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + ac_cv_sizeof_int_least64_t=0 +fi +rm -fr conftest* +fi + +fi +echo "$ac_t""$ac_cv_sizeof_int_least64_t" 1>&6 +cat >> confdefs.h <&6 +echo "configure:3248: checking size of uint_least64_t" >&5 +if eval "test \"`echo '$''{'ac_cv_sizeof_uint_least64_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test "$cross_compiling" = yes; then + ac_cv_sizeof_uint_least64_t=8 +else + cat > conftest.$ac_ext < +main() +{ + FILE *f=fopen("conftestval", "w"); + if (!f) exit(1); + fprintf(f, "%d\n", sizeof(uint_least64_t)); + exit(0); +} +EOF +if { (eval echo configure:3267: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +then + ac_cv_sizeof_uint_least64_t=`cat conftestval` +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + ac_cv_sizeof_uint_least64_t=0 +fi +rm -fr conftest* +fi + +fi +echo "$ac_t""$ac_cv_sizeof_uint_least64_t" 1>&6 +cat >> confdefs.h <&6 +echo "configure:3287: checking size of int_fast64_t" >&5 +if eval "test \"`echo '$''{'ac_cv_sizeof_int_fast64_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test "$cross_compiling" = yes; then + ac_cv_sizeof_int_fast64_t=8 +else + cat > conftest.$ac_ext < +main() +{ + FILE *f=fopen("conftestval", "w"); + if (!f) exit(1); + fprintf(f, "%d\n", sizeof(int_fast64_t)); + exit(0); +} +EOF +if { (eval echo configure:3306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +then + ac_cv_sizeof_int_fast64_t=`cat conftestval` +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + ac_cv_sizeof_int_fast64_t=0 +fi +rm -fr conftest* +fi + +fi +echo "$ac_t""$ac_cv_sizeof_int_fast64_t" 1>&6 +cat >> confdefs.h <&6 +echo "configure:3326: checking size of uint_fast64_t" >&5 +if eval "test \"`echo '$''{'ac_cv_sizeof_uint_fast64_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test "$cross_compiling" = yes; then + ac_cv_sizeof_uint_fast64_t=8 +else + cat > conftest.$ac_ext < +main() +{ + FILE *f=fopen("conftestval", "w"); + if (!f) exit(1); + fprintf(f, "%d\n", sizeof(uint_fast64_t)); + exit(0); +} +EOF +if { (eval echo configure:3345: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +then + ac_cv_sizeof_uint_fast64_t=`cat conftestval` +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + ac_cv_sizeof_uint_fast64_t=0 +fi +rm -fr conftest* +fi + +fi +echo "$ac_t""$ac_cv_sizeof_uint_fast64_t" 1>&6 +cat >> confdefs.h <&6 -echo "configure:2739: checking size of size_t" >&5 +echo "configure:3366: 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 @@ -2743,7 +3370,7 @@ else ac_cv_sizeof_size_t=4 else cat > conftest.$ac_ext < main() @@ -2754,7 +3381,7 @@ main() exit(0); } EOF -if { (eval echo configure:2758: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_size_t=`cat conftestval` else @@ -2777,7 +3404,7 @@ cat >>confdefs.h <<\EOF #include /*for off_t definition*/ EOF echo $ac_n "checking size of off_t""... $ac_c" 1>&6 -echo "configure:2781: checking size of off_t" >&5 +echo "configure:3408: 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 @@ -2785,7 +3412,7 @@ else ac_cv_sizeof_off_t=4 else cat > conftest.$ac_ext < main() @@ -2796,7 +3423,7 @@ main() exit(0); } EOF -if { (eval echo configure:2800: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3427: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_off_t=`cat conftestval` else @@ -2823,7 +3450,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:2827: checking for sizeof hsize_t and hssize_t" >&5 +echo "configure:3454: checking for sizeof hsize_t and hssize_t" >&5 case $HSIZET in no|small) @@ -2855,17 +3482,17 @@ 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:2859: checking for $ac_hdr" >&5 +echo "configure:3486: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2869: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3496: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2892,7 +3519,7 @@ fi done echo $ac_n "checking for compress in -lz""... $ac_c" 1>&6 -echo "configure:2896: checking for compress in -lz" >&5 +echo "configure:3523: 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 @@ -2900,7 +3527,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lz $LIBS" cat > conftest.$ac_ext <&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; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2941,7 +3568,7 @@ fi ;; no) echo $ac_n "checking for GNU zlib""... $ac_c" 1>&6 -echo "configure:2945: checking for GNU zlib" >&5 +echo "configure:3572: checking for GNU zlib" >&5 echo "$ac_t""suppressed" 1>&6 ;; *) @@ -2953,17 +3580,17 @@ echo "configure:2945: 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:2957: checking for $ac_hdr" >&5 +echo "configure:3584: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2967: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3594: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2995,17 +3622,17 @@ done do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2999: checking for $ac_hdr" >&5 +echo "configure:3626: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3009: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3636: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -3038,7 +3665,7 @@ done saved_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS -L$zlib_lib" echo $ac_n "checking for compress in -lz""... $ac_c" 1>&6 -echo "configure:3042: checking for compress in -lz" >&5 +echo "configure:3669: 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 @@ -3046,7 +3673,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lz $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3688: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3087,7 +3714,7 @@ fi else echo $ac_n "checking for compress in -lz""... $ac_c" 1>&6 -echo "configure:3091: checking for compress in -lz" >&5 +echo "configure:3718: 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 @@ -3095,7 +3722,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lz $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3737: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3156,17 +3783,17 @@ 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:3160: checking for $ac_hdr" >&5 +echo "configure:3787: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3170: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3797: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -3194,7 +3821,7 @@ fi done echo $ac_n "checking for main in -ldf""... $ac_c" 1>&6 -echo "configure:3198: checking for main in -ldf" >&5 +echo "configure:3825: 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 @@ -3202,14 +3829,14 @@ else ac_save_LIBS="$LIBS" LIBS="-ldf $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3840: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3238,7 +3865,7 @@ unset H5TOH4 TESTH5TOH4 fi echo $ac_n "checking for main in -lmfhdf""... $ac_c" 1>&6 -echo "configure:3242: checking for main in -lmfhdf" >&5 +echo "configure:3869: 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 @@ -3246,14 +3873,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lmfhdf $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3884: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3284,7 +3911,7 @@ fi ;; no) echo $ac_n "checking for HDF4""... $ac_c" 1>&6 -echo "configure:3288: checking for HDF4" >&5 +echo "configure:3915: checking for HDF4" >&5 echo "$ac_t""suppressed" 1>&6 unset H5TOH4 TESTH5TOH4 ;; @@ -3297,17 +3924,17 @@ echo "configure:3288: 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:3301: checking for $ac_hdr" >&5 +echo "configure:3928: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3311: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3938: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -3341,17 +3968,17 @@ done do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3345: checking for $ac_hdr" >&5 +echo "configure:3972: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3355: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3982: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -3384,7 +4011,7 @@ done saved_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS -L$hdf4_lib" echo $ac_n "checking for main in -ldf""... $ac_c" 1>&6 -echo "configure:3388: checking for main in -ldf" >&5 +echo "configure:4015: 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 @@ -3392,14 +4019,14 @@ else ac_save_LIBS="$LIBS" LIBS="-ldf $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4030: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3428,7 +4055,7 @@ unset H5TOH4 TESTH5TOH4 fi echo $ac_n "checking for main in -lmfhdf""... $ac_c" 1>&6 -echo "configure:3432: checking for main in -lmfhdf" >&5 +echo "configure:4059: 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 @@ -3436,14 +4063,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lmfhdf $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4074: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3473,7 +4100,7 @@ fi else echo $ac_n "checking for main in -ldf""... $ac_c" 1>&6 -echo "configure:3477: checking for main in -ldf" >&5 +echo "configure:4104: 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 @@ -3481,14 +4108,14 @@ else ac_save_LIBS="$LIBS" LIBS="-ldf $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4119: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3516,7 +4143,7 @@ else fi echo $ac_n "checking for main in -lmfhdf""... $ac_c" 1>&6 -echo "configure:3520: checking for main in -lmfhdf" >&5 +echo "configure:4147: 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 @@ -3524,14 +4151,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lmfhdf $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4162: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3565,9 +4192,9 @@ esac echo $ac_n "checking for tm_gmtoff in struct tm""... $ac_c" 1>&6 -echo "configure:3569: checking for tm_gmtoff in struct tm" >&5 +echo "configure:4196: checking for tm_gmtoff in struct tm" >&5 cat > conftest.$ac_ext < @@ -3576,7 +4203,7 @@ int main() { struct tm tm; tm.tm_gmtoff=0; ; return 0; } EOF -if { (eval echo configure:3580: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4207: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_TM_GMTOFF 1 @@ -3592,9 +4219,9 @@ fi rm -f conftest* echo $ac_n "checking for __tm_gmtoff in struct tm""... $ac_c" 1>&6 -echo "configure:3596: checking for __tm_gmtoff in struct tm" >&5 +echo "configure:4223: checking for __tm_gmtoff in struct tm" >&5 cat > conftest.$ac_ext < @@ -3603,7 +4230,7 @@ int main() { struct tm tm; tm.__tm_gmtoff=0; ; return 0; } EOF -if { (eval echo configure:3607: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4234: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE___TM_GMTOFF 1 @@ -3619,9 +4246,9 @@ fi rm -f conftest* echo $ac_n "checking for global timezone variable""... $ac_c" 1>&6 -echo "configure:3623: checking for global timezone variable" >&5 +echo "configure:4250: checking for global timezone variable" >&5 cat > conftest.$ac_ext < @@ -3630,7 +4257,7 @@ int main() { timezone=0; ; return 0; } EOF -if { (eval echo configure:3634: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4261: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_TIMEZONE 1 @@ -3646,12 +4273,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:3650: checking whether struct tm is in sys/time.h or time.h" >&5 +echo "configure:4277: 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 < #include @@ -3659,7 +4286,7 @@ int main() { struct tm *tp; tp->tm_sec; ; return 0; } EOF -if { (eval echo configure:3663: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4290: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else @@ -3680,12 +4307,12 @@ EOF fi echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6 -echo "configure:3684: checking for tm_zone in struct tm" >&5 +echo "configure:4311: 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 < #include <$ac_cv_struct_tm> @@ -3693,7 +4320,7 @@ int main() { struct tm tm; tm.tm_zone; ; return 0; } EOF -if { (eval echo configure:3697: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4324: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm_zone=yes else @@ -3713,12 +4340,12 @@ EOF else echo $ac_n "checking for tzname""... $ac_c" 1>&6 -echo "configure:3717: checking for tzname" >&5 +echo "configure:4344: 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 < #ifndef tzname /* For SGI. */ @@ -3728,7 +4355,7 @@ int main() { atoi(*tzname); ; return 0; } EOF -if { (eval echo configure:3732: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4359: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_cv_var_tzname=yes else @@ -3750,9 +4377,9 @@ EOF fi echo $ac_n "checking for struct timezone""... $ac_c" 1>&6 -echo "configure:3754: checking for struct timezone" >&5 +echo "configure:4381: checking for struct timezone" >&5 cat > conftest.$ac_ext < @@ -3762,7 +4389,7 @@ int main() { struct timezone tz; tz.tz_minuteswest=0; ; return 0; } EOF -if { (eval echo configure:3766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4393: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_STRUCT_TIMEZONE 1 @@ -3778,9 +4405,9 @@ fi rm -f conftest* echo $ac_n "checking for st_blocks in struct stat""... $ac_c" 1>&6 -echo "configure:3782: checking for st_blocks in struct stat" >&5 +echo "configure:4409: checking for st_blocks in struct stat" >&5 cat > conftest.$ac_ext < @@ -3788,7 +4415,7 @@ int main() { struct stat sb; sb.st_blocks=0; ; return 0; } EOF -if { (eval echo configure:3792: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4419: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_STAT_ST_BLOCKS 1 @@ -3806,12 +4433,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:3810: checking for $ac_func" >&5 +echo "configure:4437: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4465: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3861,12 +4488,12 @@ done for ac_func in _scrsize ioctl do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3865: checking for $ac_func" >&5 +echo "configure:4492: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4520: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3915,16 +4542,16 @@ done echo $ac_n "checking for struct videoconfig""... $ac_c" 1>&6 -echo "configure:3919: checking for struct videoconfig" >&5 +echo "configure:4546: checking for struct videoconfig" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4555: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_STRUCT_VIDEOCONFIG 1 @@ -3940,16 +4567,16 @@ fi rm -f conftest* echo $ac_n "checking for struct text_info""... $ac_c" 1>&6 -echo "configure:3944: checking for struct text_info" >&5 +echo "configure:4571: checking for struct text_info" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4580: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_STRUCT_TEXT_INFO 1 @@ -3965,16 +4592,16 @@ fi rm -f conftest* echo $ac_n "checking for TIOCGWINSZ""... $ac_c" 1>&6 -echo "configure:3969: checking for TIOCGWINSZ" >&5 +echo "configure:4596: checking for TIOCGWINSZ" >&5 cat > conftest.$ac_ext < int main() { int w=TIOCGWINSZ; ; return 0; } EOF -if { (eval echo configure:3978: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4605: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_TIOCGWINSZ 1 @@ -3990,16 +4617,16 @@ fi rm -f conftest* echo $ac_n "checking for TIOCGGETD""... $ac_c" 1>&6 -echo "configure:3994: checking for TIOCGGETD" >&5 +echo "configure:4621: checking for TIOCGGETD" >&5 cat > conftest.$ac_ext < int main() { int w=TIOCGETD; ; return 0; } EOF -if { (eval echo configure:4003: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4630: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_TIOCGETD 1 @@ -4018,12 +4645,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:4022: checking for $ac_func" >&5 +echo "configure:4649: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4677: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4073,12 +4700,12 @@ done for ac_func in gettimeofday BSDgettimeofday difftime snprintf vsnprintf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4077: checking for $ac_func" >&5 +echo "configure:4704: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4732: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4128,12 +4755,12 @@ done for ac_func in compress2 setsysinfo longjmp signal sigaction do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4132: checking for $ac_func" >&5 +echo "configure:4759: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4787: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4181,24 +4808,24 @@ fi done cat > conftest.$ac_ext < int main() { off64_t n = 0; ; return 0; } EOF -if { (eval echo configure:4192: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4819: \"$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:4197: checking for $ac_func" >&5 +echo "configure:4824: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4256,12 +4883,12 @@ rm -f conftest* echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:4260: checking for working const" >&5 +echo "configure:4887: 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 <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4941: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -4331,21 +4958,21 @@ EOF fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:4335: checking for inline" >&5 +echo "configure:4962: 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 <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4976: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -4372,16 +4999,16 @@ esac echo $ac_n "checking for __attribute__ extension""... $ac_c" 1>&6 -echo "configure:4376: checking for __attribute__ extension" >&5 +echo "configure:5003: checking for __attribute__ extension" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5012: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_ATTRIBUTE 1 @@ -4397,16 +5024,16 @@ fi rm -f conftest* echo $ac_n "checking for __FUNCTION__ extension""... $ac_c" 1>&6 -echo "configure:4401: checking for __FUNCTION__ extension" >&5 +echo "configure:5028: checking for __FUNCTION__ extension" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5037: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_FUNCTION 1 @@ -4422,7 +5049,7 @@ fi rm -f conftest* echo $ac_n "checking how to print long long""... $ac_c" 1>&6 -echo "configure:4426: checking how to print long long" >&5 +echo "configure:5053: 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 @@ -4431,7 +5058,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < @@ -4442,7 +5069,7 @@ else sprintf(s,"%${hdf5_cv_printf_ll}d",x); exit (strcmp(s,"1099511627776"));} EOF -if { (eval echo configure:4446: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5073: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then break else @@ -4462,7 +5089,7 @@ EOF echo $ac_n "checking for debug flags""... $ac_c" 1>&6 -echo "configure:4466: checking for debug flags" >&5 +echo "configure:5093: checking for debug flags" >&5 # Check whether --enable-debug or --disable-debug was given. if test "${enable_debug+set}" = set; then enableval="$enable_debug" @@ -4495,7 +5122,7 @@ if test "X" != "X$DEBUG_PKG"; then fi echo $ac_n "checking for API tracing""... $ac_c" 1>&6 -echo "configure:4499: checking for API tracing" >&5; +echo "configure:5126: checking for API tracing" >&5; # Check whether --enable-trace or --disable-trace was given. if test "${enable_trace+set}" = set; then enableval="$enable_trace" @@ -4524,7 +5151,7 @@ case "$CC_BASENAME" in # exists. PARALLEL=mpicc echo $ac_n "checking for mpirun""... $ac_c" 1>&6 -echo "configure:4528: checking for mpirun" >&5 +echo "configure:5155: checking for mpirun" >&5 # Find the path where mpicc is located. cmd=`echo $CC |cut -f1 -d' '` @@ -4569,7 +5196,7 @@ fi echo $ac_n "checking for parallel support files""... $ac_c" 1>&6 -echo "configure:4573: checking for parallel support files" >&5 +echo "configure:5200: checking for parallel support files" >&5 case "X-$enable_parallel" in X-|X-no|X-none) # Either we are not compiling for parallel or the header and library @@ -4600,7 +5227,7 @@ case "X-$enable_parallel" in # is missing. PARALLEL=mpich echo $ac_n "checking for MPI_Init in -lmpich""... $ac_c" 1>&6 -echo "configure:4604: checking for MPI_Init in -lmpich" >&5 +echo "configure:5231: checking for MPI_Init in -lmpich" >&5 ac_lib_var=`echo mpich'_'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 @@ -4608,7 +5235,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lmpich $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5250: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4668,10 +5295,10 @@ EOF # Display what we found about running programs echo $ac_n "checking prefix for running on one processor""... $ac_c" 1>&6 -echo "configure:4672: checking prefix for running on one processor" >&5 +echo "configure:5299: checking prefix for running on one processor" >&5 echo "$ac_t""$RUNSERIAL" 1>&6 echo $ac_n "checking prefix for running in parallel""... $ac_c" 1>&6 -echo "configure:4675: checking prefix for running in parallel" >&5 +echo "configure:5302: checking prefix for running in parallel" >&5 echo "$ac_t""$RUNPARALLEL" 1>&6 # Check that we can link a simple MPI and MPI-IO application diff --git a/configure.in b/configure.in index ec49b7f..0ad60c9 100644 --- a/configure.in +++ b/configure.in @@ -176,7 +176,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 setjmp.h) +AC_CHECK_HEADERS(stddef.h setjmp.h stdint.h) dnl Windows AC_CHECK_HEADERS(io.h winsock.h sys/timeb.h) @@ -207,18 +207,37 @@ AC_CHECK_SIZEOF(float, 4) AC_CHECK_SIZEOF(double, 8) AC_CHECK_SIZEOF(long double, 8) -dnl Posix.1g types +dnl Posix.1g types (C9x) cat >>confdefs.h <<\EOF #include EOF -AC_CHECK_SIZEOF( int8_t, 1) -AC_CHECK_SIZEOF( uint8_t, 1) -AC_CHECK_SIZEOF( int16_t, 2) -AC_CHECK_SIZEOF(uint16_t, 2) -AC_CHECK_SIZEOF( int32_t, 4) -AC_CHECK_SIZEOF(uint32_t, 4) -AC_CHECK_SIZEOF( int64_t, 8) -AC_CHECK_SIZEOF(uint64_t, 8) +AC_CHECK_SIZEOF( int8_t, 1) +AC_CHECK_SIZEOF( uint8_t, 1) +AC_CHECK_SIZEOF( int_least8_t, 1) +AC_CHECK_SIZEOF( uint_least8_t, 1) +AC_CHECK_SIZEOF( int_fast8_t, 1) +AC_CHECK_SIZEOF( uint_fast8_t, 1) + +AC_CHECK_SIZEOF( int16_t, 2) +AC_CHECK_SIZEOF( uint16_t, 2) +AC_CHECK_SIZEOF( int_least16_t, 2) +AC_CHECK_SIZEOF(uint_least16_t, 2) +AC_CHECK_SIZEOF( int_fast16_t, 2) +AC_CHECK_SIZEOF( uint_fast16_t, 2) + +AC_CHECK_SIZEOF( int32_t, 4) +AC_CHECK_SIZEOF( uint32_t, 4) +AC_CHECK_SIZEOF( int_least32_t, 4) +AC_CHECK_SIZEOF(uint_least32_t, 4) +AC_CHECK_SIZEOF( int_fast32_t, 4) +AC_CHECK_SIZEOF( uint_fast32_t, 4) + +AC_CHECK_SIZEOF( int64_t, 8) +AC_CHECK_SIZEOF( uint64_t, 8) +AC_CHECK_SIZEOF( int_least64_t, 8) +AC_CHECK_SIZEOF(uint_least64_t, 8) +AC_CHECK_SIZEOF( int_fast64_t, 8) +AC_CHECK_SIZEOF( uint_fast64_t, 8) AC_CHECK_SIZEOF(size_t, 4) cat >>confdefs.h <<\EOF diff --git a/src/H5T.c b/src/H5T.c index d29f968..17c9739 100644 --- a/src/H5T.c +++ b/src/H5T.c @@ -97,24 +97,82 @@ hid_t H5T_NATIVE_HSIZE_g = FAIL; hid_t H5T_NATIVE_HSSIZE_g = FAIL; hid_t H5T_NATIVE_HERR_g = FAIL; hid_t H5T_NATIVE_HBOOL_g = FAIL; +hid_t H5T_NATIVE_INT8_T_g = FAIL; +hid_t H5T_NATIVE_UINT8_T_g = FAIL; +hid_t H5T_NATIVE_INT_LEAST8_T_g = FAIL; +hid_t H5T_NATIVE_UINT_LEAST8_T_g = FAIL; +hid_t H5T_NATIVE_INT_FAST8_T_g = FAIL; +hid_t H5T_NATIVE_UINT_FAST8_T_g = FAIL; +hid_t H5T_NATIVE_INT16_T_g = FAIL; +hid_t H5T_NATIVE_UINT16_T_g = FAIL; +hid_t H5T_NATIVE_INT_LEAST16_T_g = FAIL; +hid_t H5T_NATIVE_UINT_LEAST16_T_g = FAIL; +hid_t H5T_NATIVE_INT_FAST16_T_g = FAIL; +hid_t H5T_NATIVE_UINT_FAST16_T_g = FAIL; +hid_t H5T_NATIVE_INT32_T_g = FAIL; +hid_t H5T_NATIVE_UINT32_T_g = FAIL; +hid_t H5T_NATIVE_INT_LEAST32_T_g = FAIL; +hid_t H5T_NATIVE_UINT_LEAST32_T_g = FAIL; +hid_t H5T_NATIVE_INT_FAST32_T_g = FAIL; +hid_t H5T_NATIVE_UINT_FAST32_T_g = FAIL; +hid_t H5T_NATIVE_INT64_T_g = FAIL; +hid_t H5T_NATIVE_UINT64_T_g = FAIL; +hid_t H5T_NATIVE_INT_LEAST64_T_g = FAIL; +hid_t H5T_NATIVE_UINT_LEAST64_T_g = FAIL; +hid_t H5T_NATIVE_INT_FAST64_T_g = FAIL; +hid_t H5T_NATIVE_UINT_FAST64_T_g = FAIL; /* * Alignment constraints for native types. These are initialized at run time * in H5Tinit.c */ -size_t H5T_NATIVE_SCHAR_ALIGN_g = 0; -size_t H5T_NATIVE_UCHAR_ALIGN_g = 0; -size_t H5T_NATIVE_SHORT_ALIGN_g = 0; -size_t H5T_NATIVE_USHORT_ALIGN_g = 0; -size_t H5T_NATIVE_INT_ALIGN_g = 0; -size_t H5T_NATIVE_UINT_ALIGN_g = 0; -size_t H5T_NATIVE_LONG_ALIGN_g = 0; -size_t H5T_NATIVE_ULONG_ALIGN_g = 0; -size_t H5T_NATIVE_LLONG_ALIGN_g = 0; -size_t H5T_NATIVE_ULLONG_ALIGN_g = 0; -size_t H5T_NATIVE_FLOAT_ALIGN_g = 0; -size_t H5T_NATIVE_DOUBLE_ALIGN_g = 0; -size_t H5T_NATIVE_LDOUBLE_ALIGN_g = 0; +size_t H5T_NATIVE_SCHAR_ALIGN_g = 0; +size_t H5T_NATIVE_UCHAR_ALIGN_g = 0; +size_t H5T_NATIVE_SHORT_ALIGN_g = 0; +size_t H5T_NATIVE_USHORT_ALIGN_g = 0; +size_t H5T_NATIVE_INT_ALIGN_g = 0; +size_t H5T_NATIVE_UINT_ALIGN_g = 0; +size_t H5T_NATIVE_LONG_ALIGN_g = 0; +size_t H5T_NATIVE_ULONG_ALIGN_g = 0; +size_t H5T_NATIVE_LLONG_ALIGN_g = 0; +size_t H5T_NATIVE_ULLONG_ALIGN_g = 0; +size_t H5T_NATIVE_FLOAT_ALIGN_g = 0; +size_t H5T_NATIVE_DOUBLE_ALIGN_g = 0; +size_t H5T_NATIVE_LDOUBLE_ALIGN_g = 0; + +/* + * Alignment constraints for C9x types. These are initialized at run time in + * H5Tinit.c if the types are provided by the system. Otherwise we set their + * values to 0 here (no alignment calculated). + */ +size_t H5T_NATIVE_INT8_T_ALIGN_g = 0; +size_t H5T_NATIVE_UINT8_T_ALIGN_g = 0; +size_t H5T_NATIVE_INT_LEAST8_T_ALIGN_g = 0; +size_t H5T_NATIVE_UINT_LEAST8_T_ALIGN_g = 0; +size_t H5T_NATIVE_INT_FAST8_T_ALIGN_g = 0; +size_t H5T_NATIVE_UINT_FAST8_T_ALIGN_g = 0; + +size_t H5T_NATIVE_INT16_T_ALIGN_g = 0; +size_t H5T_NATIVE_UINT16_T_ALIGN_g = 0; +size_t H5T_NATIVE_INT_LEAST16_T_ALIGN_g = 0; +size_t H5T_NATIVE_UINT_LEAST16_T_ALIGN_g= 0; +size_t H5T_NATIVE_INT_FAST16_T_ALIGN_g = 0; +size_t H5T_NATIVE_UINT_FAST16_T_ALIGN_g = 0; + +size_t H5T_NATIVE_INT32_T_ALIGN_g = 0; +size_t H5T_NATIVE_UINT32_T_ALIGN_g = 0; +size_t H5T_NATIVE_INT_LEAST32_T_ALIGN_g = 0; +size_t H5T_NATIVE_UINT_LEAST32_T_ALIGN_g= 0; +size_t H5T_NATIVE_INT_FAST32_T_ALIGN_g = 0; +size_t H5T_NATIVE_UINT_FAST32_T_ALIGN_g = 0; + +size_t H5T_NATIVE_INT64_T_ALIGN_g = 0; +size_t H5T_NATIVE_UINT64_T_ALIGN_g = 0; +size_t H5T_NATIVE_INT_LEAST64_T_ALIGN_g = 0; +size_t H5T_NATIVE_UINT_LEAST64_T_ALIGN_g= 0; +size_t H5T_NATIVE_INT_FAST64_T_ALIGN_g = 0; +size_t H5T_NATIVE_UINT_FAST64_T_ALIGN_g = 0; + /* * The path database. Each path has a source and destination data type pair @@ -203,6 +261,164 @@ H5T_init_interface(void) } /*------------------------------------------------------------ + * Defaults for C9x types + *------------------------------------------------------------ + */ + + /* int8 */ + if (H5T_NATIVE_INT8_T_g<0) { + dt = H5I_object(H5T_NATIVE_INT8_T_g = H5Tcopy(H5T_NATIVE_INT_g)); + dt->state = H5T_STATE_IMMUTABLE; + dt->size = 1; + dt->u.atomic.prec = 8; + } + if (H5T_NATIVE_UINT8_T_g<0) { + dt = H5I_object(H5T_NATIVE_UINT8_T_g = H5Tcopy(H5T_NATIVE_UINT_g)); + dt->state = H5T_STATE_IMMUTABLE; + dt->size = 1; + dt->u.atomic.prec = 8; + } + if (H5T_NATIVE_INT_LEAST8_T_g<0) { + dt = H5I_object(H5T_NATIVE_INT_LEAST8_T_g=H5Tcopy(H5T_NATIVE_INT_g)); + dt->state = H5T_STATE_IMMUTABLE; + dt->size = 1; + dt->u.atomic.prec = 8; + } + if (H5T_NATIVE_UINT_LEAST8_T_g<0) { + dt = H5I_object(H5T_NATIVE_UINT_LEAST8_T_g=H5Tcopy(H5T_NATIVE_UINT_g)); + dt->state = H5T_STATE_IMMUTABLE; + dt->size = 1; + dt->u.atomic.prec = 8; + } + if (H5T_NATIVE_INT_FAST8_T_g<0) { + dt = H5I_object(H5T_NATIVE_INT_FAST8_T_g=H5Tcopy(H5T_NATIVE_INT_g)); + dt->state = H5T_STATE_IMMUTABLE; + dt->size = 1; + dt->u.atomic.prec = 8; + } + if (H5T_NATIVE_UINT_FAST8_T_g<0) { + dt = H5I_object(H5T_NATIVE_UINT_FAST8_T_g=H5Tcopy(H5T_NATIVE_UINT_g)); + dt->state = H5T_STATE_IMMUTABLE; + dt->size = 1; + dt->u.atomic.prec = 8; + } + + /* int16 */ + if (H5T_NATIVE_INT16_T_g<0) { + dt = H5I_object(H5T_NATIVE_INT16_T_g = H5Tcopy(H5T_NATIVE_INT_g)); + dt->state = H5T_STATE_IMMUTABLE; + dt->size = 2; + dt->u.atomic.prec = 16; + } + if (H5T_NATIVE_UINT16_T_g<0) { + dt = H5I_object(H5T_NATIVE_UINT16_T_g = H5Tcopy(H5T_NATIVE_UINT_g)); + dt->state = H5T_STATE_IMMUTABLE; + dt->size = 2; + dt->u.atomic.prec = 16; + } + if (H5T_NATIVE_INT_LEAST16_T_g<0) { + dt = H5I_object(H5T_NATIVE_INT_LEAST16_T_g=H5Tcopy(H5T_NATIVE_INT_g)); + dt->state = H5T_STATE_IMMUTABLE; + dt->size = 2; + dt->u.atomic.prec = 16; + } + if (H5T_NATIVE_UINT_LEAST16_T_g<0) { + dt=H5I_object(H5T_NATIVE_UINT_LEAST16_T_g=H5Tcopy(H5T_NATIVE_UINT_g)); + dt->state = H5T_STATE_IMMUTABLE; + dt->size = 2; + dt->u.atomic.prec = 16; + } + if (H5T_NATIVE_INT_FAST16_T_g<0) { + dt = H5I_object(H5T_NATIVE_INT_FAST16_T_g=H5Tcopy(H5T_NATIVE_INT_g)); + dt->state = H5T_STATE_IMMUTABLE; + dt->size = 2; + dt->u.atomic.prec = 16; + } + if (H5T_NATIVE_UINT_FAST16_T_g<0) { + dt = H5I_object(H5T_NATIVE_UINT_FAST16_T_g=H5Tcopy(H5T_NATIVE_UINT_g)); + dt->state = H5T_STATE_IMMUTABLE; + dt->size = 2; + dt->u.atomic.prec = 16; + } + + /* int32 */ + if (H5T_NATIVE_INT32_T_g<0) { + dt = H5I_object(H5T_NATIVE_INT32_T_g = H5Tcopy(H5T_NATIVE_INT_g)); + dt->state = H5T_STATE_IMMUTABLE; + dt->size = 4; + dt->u.atomic.prec = 32; + } + if (H5T_NATIVE_UINT32_T_g<0) { + dt = H5I_object(H5T_NATIVE_UINT32_T_g = H5Tcopy(H5T_NATIVE_UINT_g)); + dt->state = H5T_STATE_IMMUTABLE; + dt->size = 4; + dt->u.atomic.prec = 32; + } + if (H5T_NATIVE_INT_LEAST32_T_g<0) { + dt = H5I_object(H5T_NATIVE_INT_LEAST32_T_g=H5Tcopy(H5T_NATIVE_INT_g)); + dt->state = H5T_STATE_IMMUTABLE; + dt->size = 4; + dt->u.atomic.prec = 32; + } + if (H5T_NATIVE_UINT_LEAST32_T_g<0) { + dt=H5I_object(H5T_NATIVE_UINT_LEAST32_T_g=H5Tcopy(H5T_NATIVE_UINT_g)); + dt->state = H5T_STATE_IMMUTABLE; + dt->size = 4; + dt->u.atomic.prec = 32; + } + if (H5T_NATIVE_INT_FAST32_T_g<0) { + dt = H5I_object(H5T_NATIVE_INT_FAST32_T_g=H5Tcopy(H5T_NATIVE_INT_g)); + dt->state = H5T_STATE_IMMUTABLE; + dt->size = 4; + dt->u.atomic.prec = 32; + } + if (H5T_NATIVE_UINT_FAST32_T_g<0) { + dt = H5I_object(H5T_NATIVE_UINT_FAST32_T_g=H5Tcopy(H5T_NATIVE_UINT_g)); + dt->state = H5T_STATE_IMMUTABLE; + dt->size = 4; + dt->u.atomic.prec = 32; + } + + /* int64 */ + if (H5T_NATIVE_INT64_T_g<0) { + dt = H5I_object(H5T_NATIVE_INT64_T_g = H5Tcopy(H5T_NATIVE_INT_g)); + dt->state = H5T_STATE_IMMUTABLE; + dt->size = 8; + dt->u.atomic.prec = 64; + } + if (H5T_NATIVE_UINT64_T_g<0) { + dt = H5I_object(H5T_NATIVE_UINT64_T_g = H5Tcopy(H5T_NATIVE_UINT_g)); + dt->state = H5T_STATE_IMMUTABLE; + dt->size = 8; + dt->u.atomic.prec = 64; + } + if (H5T_NATIVE_INT_LEAST64_T_g<0) { + dt = H5I_object(H5T_NATIVE_INT_LEAST64_T_g=H5Tcopy(H5T_NATIVE_INT_g)); + dt->state = H5T_STATE_IMMUTABLE; + dt->size = 8; + dt->u.atomic.prec = 64; + } + if (H5T_NATIVE_UINT_LEAST64_T_g<0) { + dt=H5I_object(H5T_NATIVE_UINT_LEAST64_T_g=H5Tcopy(H5T_NATIVE_UINT_g)); + dt->state = H5T_STATE_IMMUTABLE; + dt->size = 8; + dt->u.atomic.prec = 64; + } + if (H5T_NATIVE_INT_FAST64_T_g<0) { + dt = H5I_object(H5T_NATIVE_INT_FAST64_T_g=H5Tcopy(H5T_NATIVE_INT_g)); + dt->state = H5T_STATE_IMMUTABLE; + dt->size = 8; + dt->u.atomic.prec = 64; + } + if (H5T_NATIVE_UINT_FAST64_T_g<0) { + dt = H5I_object(H5T_NATIVE_UINT_FAST64_T_g=H5Tcopy(H5T_NATIVE_UINT_g)); + dt->state = H5T_STATE_IMMUTABLE; + dt->size = 8; + dt->u.atomic.prec = 64; + } + + + /*------------------------------------------------------------ * Native types *------------------------------------------------------------ */ @@ -661,6 +877,7 @@ H5T_init_interface(void) * Pointer types *------------------------------------------------------------ */ + /* Object pointer (i.e. object header address in file) */ if (NULL==(dt = H5MM_calloc(sizeof(H5T_t)))) { HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL, @@ -680,6 +897,7 @@ H5T_init_interface(void) HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to initialize H5T layer"); } + /* Dataset Region pointer (i.e. selection inside a dataset) */ if (NULL==(dt = H5MM_calloc(sizeof(H5T_t)))) { HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL, @@ -700,6 +918,10 @@ H5T_init_interface(void) "unable to initialize H5T layer"); } + /* + * Register conversion functions beginning with the most general and + * ending with the most specific. + */ fixedpt = H5T_NATIVE_INT; floatpt = H5T_NATIVE_FLOAT; string = H5T_C_S1; @@ -708,10 +930,7 @@ H5T_init_interface(void) enum_type = H5Tcreate(H5T_ENUM, 1); vlen_type = H5Tvlen_create(H5T_NATIVE_INT); status = 0; - /* - * Register conversion functions beginning with the most general and - * ending with the most specific. - */ + status |= H5Tregister(H5T_PERS_SOFT, "i_i", fixedpt, fixedpt, H5T_conv_i_i); diff --git a/src/H5Tpkg.h b/src/H5Tpkg.h index 5a8942d..3ceeeab 100644 --- a/src/H5Tpkg.h +++ b/src/H5Tpkg.h @@ -178,6 +178,35 @@ __DLLVAR__ size_t H5T_NATIVE_FLOAT_ALIGN_g; __DLLVAR__ size_t H5T_NATIVE_DOUBLE_ALIGN_g; __DLLVAR__ size_t H5T_NATIVE_LDOUBLE_ALIGN_g; +/* C9x alignment constraints */ +__DLLVAR__ size_t H5T_NATIVE_INT8_T_ALIGN_g; +__DLLVAR__ size_t H5T_NATIVE_UINT8_T_ALIGN_g; +__DLLVAR__ size_t H5T_NATIVE_INT_LEAST8_T_ALIGN_g; +__DLLVAR__ size_t H5T_NATIVE_UINT_LEAST8_T_ALIGN_g; +__DLLVAR__ size_t H5T_NATIVE_INT_FAST8_T_ALIGN_g; +__DLLVAR__ size_t H5T_NATIVE_UINT_FAST8_T_ALIGN_g; + +__DLLVAR__ size_t H5T_NATIVE_INT16_T_ALIGN_g; +__DLLVAR__ size_t H5T_NATIVE_UINT16_T_ALIGN_g; +__DLLVAR__ size_t H5T_NATIVE_INT_LEAST16_T_ALIGN_g; +__DLLVAR__ size_t H5T_NATIVE_UINT_LEAST16_T_ALIGN_g; +__DLLVAR__ size_t H5T_NATIVE_INT_FAST16_T_ALIGN_g; +__DLLVAR__ size_t H5T_NATIVE_UINT_FAST16_T_ALIGN_g; + +__DLLVAR__ size_t H5T_NATIVE_INT32_T_ALIGN_g; +__DLLVAR__ size_t H5T_NATIVE_UINT32_T_ALIGN_g; +__DLLVAR__ size_t H5T_NATIVE_INT_LEAST32_T_ALIGN_g; +__DLLVAR__ size_t H5T_NATIVE_UINT_LEAST32_T_ALIGN_g; +__DLLVAR__ size_t H5T_NATIVE_INT_FAST32_T_ALIGN_g; +__DLLVAR__ size_t H5T_NATIVE_UINT_FAST32_T_ALIGN_g; + +__DLLVAR__ size_t H5T_NATIVE_INT64_T_ALIGN_g; +__DLLVAR__ size_t H5T_NATIVE_UINT64_T_ALIGN_g; +__DLLVAR__ size_t H5T_NATIVE_INT_LEAST64_T_ALIGN_g; +__DLLVAR__ size_t H5T_NATIVE_UINT_LEAST64_T_ALIGN_g; +__DLLVAR__ size_t H5T_NATIVE_INT_FAST64_T_ALIGN_g; +__DLLVAR__ size_t H5T_NATIVE_UINT_FAST64_T_ALIGN_g; + /* Conversion functions */ __DLL__ herr_t H5T_conv_noop(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void *bkg); diff --git a/src/H5Tpublic.h b/src/H5Tpublic.h index db5e2a6..e208351 100644 --- a/src/H5Tpublic.h +++ b/src/H5Tpublic.h @@ -382,7 +382,60 @@ __DLLVAR__ hid_t H5T_NATIVE_HSIZE_g; __DLLVAR__ hid_t H5T_NATIVE_HSSIZE_g; __DLLVAR__ hid_t H5T_NATIVE_HERR_g; __DLLVAR__ hid_t H5T_NATIVE_HBOOL_g; - + +/* C9x integer types */ +#define H5T_NATIVE_INT8_T (H5open(), H5T_NATIVE_INT8_T_g) +#define H5T_NATIVE_UINT8_T (H5open(), H5T_NATIVE_UINT8_T_g) +#define H5T_NATIVE_INT_LEAST8_T (H5open(), H5T_NATIVE_INT_LEAST8_T_g) +#define H5T_NATIVE_UINT_LEAST8_T (H5open(), H5T_NATIVE_UINT_LEAST8_T_g) +#define H5T_NATIVE_INT_FAST8_T (H5open(), H5T_NATIVE_INT_FAST8_T_g) +#define H5T_NATIVE_UINT_FAST8_T (H5open(), H5T_NATIVE_UINT_FAST8_T_g) +__DLLVAR__ hid_t H5T_NATIVE_INT8_T_g; +__DLLVAR__ hid_t H5T_NATIVE_UINT8_T_g; +__DLLVAR__ hid_t H5T_NATIVE_INT_LEAST8_T_g; +__DLLVAR__ hid_t H5T_NATIVE_UINT_LEAST8_T_g; +__DLLVAR__ hid_t H5T_NATIVE_INT_FAST8_T_g; +__DLLVAR__ hid_t H5T_NATIVE_UINT_FAST8_T_g; + +#define H5T_NATIVE_INT16_T (H5open(), H5T_NATIVE_INT16_T_g) +#define H5T_NATIVE_UINT16_T (H5open(), H5T_NATIVE_UINT16_T_g) +#define H5T_NATIVE_INT_LEAST16_T (H5open(), H5T_NATIVE_INT_LEAST16_T_g) +#define H5T_NATIVE_UINT_LEAST16_T (H5open(), H5T_NATIVE_UINT_LEAST16_T_g) +#define H5T_NATIVE_INT_FAST16_T (H5open(), H5T_NATIVE_INT_FAST16_T_g) +#define H5T_NATIVE_UINT_FAST16_T (H5open(), H5T_NATIVE_UINT_FAST16_T_g) +__DLLVAR__ hid_t H5T_NATIVE_INT16_T_g; +__DLLVAR__ hid_t H5T_NATIVE_UINT16_T_g; +__DLLVAR__ hid_t H5T_NATIVE_INT_LEAST16_T_g; +__DLLVAR__ hid_t H5T_NATIVE_UINT_LEAST16_T_g; +__DLLVAR__ hid_t H5T_NATIVE_INT_FAST16_T_g; +__DLLVAR__ hid_t H5T_NATIVE_UINT_FAST16_T_g; + +#define H5T_NATIVE_INT32_T (H5open(), H5T_NATIVE_INT32_T_g) +#define H5T_NATIVE_UINT32_T (H5open(), H5T_NATIVE_UINT32_T_g) +#define H5T_NATIVE_INT_LEAST32_T (H5open(), H5T_NATIVE_INT_LEAST32_T_g) +#define H5T_NATIVE_UINT_LEAST32_T (H5open(), H5T_NATIVE_UINT_LEAST32_T_g) +#define H5T_NATIVE_INT_FAST32_T (H5open(), H5T_NATIVE_INT_FAST32_T_g) +#define H5T_NATIVE_UINT_FAST32_T (H5open(), H5T_NATIVE_UINT_FAST32_T_g) +__DLLVAR__ hid_t H5T_NATIVE_INT32_T_g; +__DLLVAR__ hid_t H5T_NATIVE_UINT32_T_g; +__DLLVAR__ hid_t H5T_NATIVE_INT_LEAST32_T_g; +__DLLVAR__ hid_t H5T_NATIVE_UINT_LEAST32_T_g; +__DLLVAR__ hid_t H5T_NATIVE_INT_FAST32_T_g; +__DLLVAR__ hid_t H5T_NATIVE_UINT_FAST32_T_g; + +#define H5T_NATIVE_INT64_T (H5open(), H5T_NATIVE_INT64_T_g) +#define H5T_NATIVE_UINT64_T (H5open(), H5T_NATIVE_UINT64_T_g) +#define H5T_NATIVE_INT_LEAST64_T (H5open(), H5T_NATIVE_INT_LEAST64_T_g) +#define H5T_NATIVE_UINT_LEAST64_T (H5open(), H5T_NATIVE_UINT_LEAST64_T_g) +#define H5T_NATIVE_INT_FAST64_T (H5open(), H5T_NATIVE_INT_FAST64_T_g) +#define H5T_NATIVE_UINT_FAST64_T (H5open(), H5T_NATIVE_UINT_FAST64_T_g) +__DLLVAR__ hid_t H5T_NATIVE_INT64_T_g; +__DLLVAR__ hid_t H5T_NATIVE_UINT64_T_g; +__DLLVAR__ hid_t H5T_NATIVE_INT_LEAST64_T_g; +__DLLVAR__ hid_t H5T_NATIVE_UINT_LEAST64_T_g; +__DLLVAR__ hid_t H5T_NATIVE_INT_FAST64_T_g; +__DLLVAR__ hid_t H5T_NATIVE_UINT_FAST64_T_g; + /* Operations defined on all data types */ __DLL__ hid_t H5Topen(hid_t loc_id, const char *name); __DLL__ hid_t H5Tcreate(H5T_class_t type, size_t size); diff --git a/src/H5config.h.in b/src/H5config.h.in index cdb3fb2..0cddcf1 100644 --- a/src/H5config.h.in +++ b/src/H5config.h.in @@ -101,6 +101,30 @@ /* The number of bytes in a int8_t. */ #undef SIZEOF_INT8_T +/* The number of bytes in a int_fast16_t. */ +#undef SIZEOF_INT_FAST16_T + +/* The number of bytes in a int_fast32_t. */ +#undef SIZEOF_INT_FAST32_T + +/* The number of bytes in a int_fast64_t. */ +#undef SIZEOF_INT_FAST64_T + +/* The number of bytes in a int_fast8_t. */ +#undef SIZEOF_INT_FAST8_T + +/* The number of bytes in a int_least16_t. */ +#undef SIZEOF_INT_LEAST16_T + +/* The number of bytes in a int_least32_t. */ +#undef SIZEOF_INT_LEAST32_T + +/* The number of bytes in a int_least64_t. */ +#undef SIZEOF_INT_LEAST64_T + +/* The number of bytes in a int_least8_t. */ +#undef SIZEOF_INT_LEAST8_T + /* The number of bytes in a long. */ #undef SIZEOF_LONG @@ -131,6 +155,30 @@ /* The number of bytes in a uint8_t. */ #undef SIZEOF_UINT8_T +/* The number of bytes in a uint_fast16_t. */ +#undef SIZEOF_UINT_FAST16_T + +/* The number of bytes in a uint_fast32_t. */ +#undef SIZEOF_UINT_FAST32_T + +/* The number of bytes in a uint_fast64_t. */ +#undef SIZEOF_UINT_FAST64_T + +/* The number of bytes in a uint_fast8_t. */ +#undef SIZEOF_UINT_FAST8_T + +/* The number of bytes in a uint_least16_t. */ +#undef SIZEOF_UINT_LEAST16_T + +/* The number of bytes in a uint_least32_t. */ +#undef SIZEOF_UINT_LEAST32_T + +/* The number of bytes in a uint_least64_t. */ +#undef SIZEOF_UINT_LEAST64_T + +/* The number of bytes in a uint_least8_t. */ +#undef SIZEOF_UINT_LEAST8_T + /* Define if you have the BSDgettimeofday function. */ #undef HAVE_BSDGETTIMEOFDAY @@ -212,6 +260,9 @@ /* Define if you have the header file. */ #undef HAVE_STDDEF_H +/* Define if you have the header file. */ +#undef HAVE_STDINT_H + /* Define if you have the header file. */ #undef HAVE_SYS_IOCTL_H diff --git a/src/H5detect.c b/src/H5detect.c index 6943972..1d07df8 100644 --- a/src/H5detect.c +++ b/src/H5detect.c @@ -32,7 +32,7 @@ static const char *FileHeader = "\n\ #undef NDEBUG #include -#define MAXDETECT 16 +#define MAXDETECT 64 /* * This structure holds information about a type that * was detected. @@ -994,39 +994,118 @@ main(void) print_header(); - DETECT_I(signed char, SCHAR, d[nd]); nd++; - DETECT_I(unsigned char, UCHAR, d[nd]); nd++; - DETECT_I(short, SHORT, d[nd]); nd++; - DETECT_I(unsigned short, USHORT, d[nd]); nd++; - DETECT_I(int, INT, d[nd]); nd++; - DETECT_I(unsigned int, UINT, d[nd]); nd++; - DETECT_I(long, LONG, d[nd]); nd++; - DETECT_I(unsigned long, ULONG, d[nd]); nd++; + /* C89 integer types */ + DETECT_I(signed char, SCHAR, d[nd]); nd++; + DETECT_I(unsigned char, UCHAR, d[nd]); nd++; + DETECT_I(short, SHORT, d[nd]); nd++; + DETECT_I(unsigned short, USHORT, d[nd]); nd++; + DETECT_I(int, INT, d[nd]); nd++; + DETECT_I(unsigned int, UINT, d[nd]); nd++; + DETECT_I(long, LONG, d[nd]); nd++; + DETECT_I(unsigned long, ULONG, d[nd]); nd++; + /* + * C9x integer types. + */ +#if SIZEOF_INT8_T>0 + DETECT_I(int8_t, INT8_T, d[nd]); nd++; +#endif +#if SIZEOF_UINT8_T>0 + DETECT_I(uint8_t, UINT8_T, d[nd]); nd++; +#endif +#if SIZEOF_INT_LEAST8_T>0 + DETECT_I(int_least8_t, INT_LEAST8_T, d[nd]); nd++; +#endif +#if SIZEOF_UINT_LEAST8_T>0 + DETECT_I(uint_least8_t, UINT_LEAST8_T, d[nd]); nd++; +#endif +#if SIZEOF_INT_FAST8_T>0 + DETECT_I(int_fast8_t, INT_FAST8_T, d[nd]); nd++; +#endif +#if SIZEOF_UINT_FAST8_T>0 + DETECT_I(uint_fast8_t, UINT_FAST8_T, d[nd]); nd++; +#endif +#if SIZEOF_INT16_T>0 + DETECT_I(int16_t, INT16_T, d[nd]); nd++; +#endif +#if SIZEOF_UINT16_T>0 + DETECT_I(uint16_t, UINT16_T, d[nd]); nd++; +#endif +#if SIZEOF_INT_LEAST16_T>0 + DETECT_I(int_least16_t, INT_LEAST16_T, d[nd]); nd++; +#endif +#if SIZEOF_UINT_LEAST16_T>0 + DETECT_I(uint_least16_t, UINT_LEAST16_T, d[nd]); nd++; +#endif +#if SIZEOF_INT_FAST16_T>0 + DETECT_I(int_fast16_t, INT_FAST16_T, d[nd]); nd++; +#endif +#if SIZEOF_UINT_FAST16_T>0 + DETECT_I(uint_fast16_t, UINT_FAST16_T, d[nd]); nd++; +#endif +#if SIZEOF_INT32_T>0 + DETECT_I(int32_t, INT32_T, d[nd]); nd++; +#endif +#if SIZEOF_UINT32_T>0 + DETECT_I(uint32_t, UINT32_T, d[nd]); nd++; +#endif +#if SIZEOF_INT_LEAST32_T>0 + DETECT_I(int_least32_t, INT_LEAST32_T, d[nd]); nd++; +#endif +#if SIZEOF_UINT_LEAST32_T>0 + DETECT_I(uint_least32_t, UINT_LEAST32_T, d[nd]); nd++; +#endif +#if SIZEOF_INT_FAST32_T>0 + DETECT_I(int_fast32_t, INT_FAST32_T, d[nd]); nd++; +#endif +#if SIZEOF_UINT_FAST32_T>0 + DETECT_I(uint_fast32_t, UINT_FAST32_T, d[nd]); nd++; +#endif +#if SIZEOF_INT64_T>0 + DETECT_I(int64_t, INT64_T, d[nd]); nd++; +#endif +#if SIZEOF_UINT64_T>0 + DETECT_I(uint64_t, UINT64_T, d[nd]); nd++; +#endif +#if SIZEOF_INT_LEAST64_T>0 + DETECT_I(int_least64_t, INT_LEAST64_T, d[nd]); nd++; +#endif +#if SIZEOF_UINT_LEAST64_T>0 + DETECT_I(uint_least64_t, UINT_LEAST64_T, d[nd]); nd++; +#endif +#if SIZEOF_INT_FAST64_T>0 + DETECT_I(int_fast64_t, INT_FAST64_T, d[nd]); nd++; +#endif +#if SIZEOF_UINT_FAST64_T>0 + DETECT_I(uint_fast64_t, UINT_FAST64_T, d[nd]); nd++; +#endif + #if SIZEOF_LONG_LONG>0 - DETECT_I(long_long, LLONG, d[nd]); nd++; - DETECT_I(unsigned long_long, ULLONG, d[nd]); nd++; + DETECT_I(long_long, LLONG, d[nd]); nd++; + DETECT_I(unsigned long_long, ULLONG, d[nd]); nd++; #else /* * This architecture doesn't support an integer type larger than `long' - * so we'll just make H5T_NATIVE_LLONG the same as H5T_NATIVE_LONG. + * so we'll just make H5T_NATIVE_LLONG the same as H5T_NATIVE_LONG since + * `long long' is probably equivalent to `long' here anyway. */ - DETECT_I(long, LLONG, d[nd]); nd++; - DETECT_I(unsigned long, ULLONG, d[nd]); nd++; + DETECT_I(long, LLONG, d[nd]); nd++; + DETECT_I(unsigned long, ULLONG, d[nd]); nd++; #endif - DETECT_F(float, FLOAT, d[nd]); nd++; - DETECT_F(double, DOUBLE, d[nd]); nd++; + DETECT_F(float, FLOAT, d[nd]); nd++; + DETECT_F(double, DOUBLE, d[nd]); nd++; #if SIZEOF_DOUBLE == SIZEOF_LONG_DOUBLE /* * If sizeof(double)==sizeof(long double) then assume that `long double' * isn't supported and use `double' instead. This suppresses warnings on - * some systems. + * some systems and `long double' is probably the same as `double' here + * anyway. */ - DETECT_F(double, LDOUBLE, d[nd]); nd++; + DETECT_F(double, LDOUBLE, d[nd]); nd++; #else - DETECT_F(long double, LDOUBLE, d[nd]); nd++; + DETECT_F(long double, LDOUBLE, d[nd]); nd++; #endif print_results (nd, d); diff --git a/src/H5private.h b/src/H5private.h index 6c80e2b..5d973c5 100644 --- a/src/H5private.h +++ b/src/H5private.h @@ -46,6 +46,13 @@ #endif /* + * C9x integer types + */ +#ifdef HAVE_STDINT_H +# include +#endif + +/* * The `struct stat' data type for stat() and fstat(). This is a Posix file * but often apears on non-Posix systems also. The `struct stat' is required * for hdf5 to compile, although only a few fields are actually used. -- cgit v0.12