From 3674c78a6ee2be3292bafd3d7dae28a90a52b699 Mon Sep 17 00:00:00 2001 From: Dana Robinson Date: Tue, 11 Oct 2011 14:04:46 -0500 Subject: [svn-r21517] - Added checks for clock_gettime() to configure.in. Tested on Linux, FreeBSD, Solaris, MacOSX to ensure they are found correctly and everything builds. No code currently relys on clock_gettime(). - Brought Windows and VMS H5pubconf.h files into sync with the Linux file. Tested on Windows. Ray will test on VMS when this is pushed to the 1.8.x branch. --- configure | 196 ++++++++++++++++++++++++++++++++++-------------- configure.in | 13 +++- src/H5config.h.in | 3 + vms/src/h5pubconf.h | 104 ++++++++++++++++--------- windows/src/H5pubconf.h | 124 ++++++++++++++++++++++++------ 5 files changed, 325 insertions(+), 115 deletions(-) diff --git a/configure b/configure index f2219ae..c476921 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Id: configure.in 21443 2011-10-02 14:35:04Z hdftest . +# From configure.in Id: configure.in 21499 2011-10-09 14:02:51Z hdftest . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.68 for HDF5 1.9.95. # @@ -2685,21 +2685,23 @@ rm -f conftest.val } # ac_fn_c_compute_int -# ac_fn_c_check_member LINENO AGGR MEMBER VAR INCLUDES -# ---------------------------------------------------- -# Tries to find if the field MEMBER exists in type AGGR, after including -# INCLUDES, setting cache variable VAR accordingly. -ac_fn_c_check_member () +# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES +# --------------------------------------------- +# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR +# accordingly. +ac_fn_c_check_decl () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5 -$as_echo_n "checking for $2.$3... " >&6; } -if eval \${$4+:} false; then : + as_decl_name=`echo $2|sed 's/ *(.*//'` + as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5 +$as_echo_n "checking whether $as_decl_name is declared... " >&6; } +if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -$5 +$4 #ifdef FC_DUMMY_MAIN #ifndef FC_DUMMY_MAIN_EQ_F77 # ifdef __cplusplus @@ -2711,15 +2713,43 @@ $5 int main () { -static $2 ac_aggr; -if (ac_aggr.$3) -return 0; +#ifndef $as_decl_name +#ifdef __cplusplus + (void) $as_decl_use; +#else + (void) $as_decl_name; +#endif +#endif + ; return 0; } _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - eval "$4=yes" + eval "$3=yes" +else + eval "$3=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_decl + +# ac_fn_c_check_member LINENO AGGR MEMBER VAR INCLUDES +# ---------------------------------------------------- +# Tries to find if the field MEMBER exists in type AGGR, after including +# INCLUDES, setting cache variable VAR accordingly. +ac_fn_c_check_member () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5 +$as_echo_n "checking for $2.$3... " >&6; } +if eval \${$4+:} false; then : + $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -2736,7 +2766,7 @@ int main () { static $2 ac_aggr; -if (sizeof ac_aggr.$3) +if (ac_aggr.$3) return 0; ; return 0; @@ -2745,36 +2775,9 @@ _ACEOF if ac_fn_c_try_compile "$LINENO"; then : eval "$4=yes" else - eval "$4=no" -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -eval ac_res=\$$4 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - -} # ac_fn_c_check_member - -# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES -# --------------------------------------------- -# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR -# accordingly. -ac_fn_c_check_decl () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - as_decl_name=`echo $2|sed 's/ *(.*//'` - as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'` - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5 -$as_echo_n "checking whether $as_decl_name is declared... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -$4 +$5 #ifdef FC_DUMMY_MAIN #ifndef FC_DUMMY_MAIN_EQ_F77 # ifdef __cplusplus @@ -2786,31 +2789,28 @@ $4 int main () { -#ifndef $as_decl_name -#ifdef __cplusplus - (void) $as_decl_use; -#else - (void) $as_decl_name; -#endif -#endif - +static $2 ac_aggr; +if (sizeof ac_aggr.$3) +return 0; ; return 0; } _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - eval "$3=yes" + eval "$4=yes" else - eval "$3=no" + eval "$4=no" fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -eval ac_res=\$$3 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +eval ac_res=\$$4 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -} # ac_fn_c_check_decl +} # ac_fn_c_check_member cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. @@ -22187,6 +22187,83 @@ else fi done +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing clock_gettime" >&5 +$as_echo_n "checking for library containing clock_gettime... " >&6; } +if ${ac_cv_search_clock_gettime+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char clock_gettime (); +#ifdef FC_DUMMY_MAIN +#ifndef FC_DUMMY_MAIN_EQ_F77 +# ifdef __cplusplus + extern "C" +# endif + int FC_DUMMY_MAIN() { return 1; } +#endif +#endif +int +main () +{ +return clock_gettime (); + ; + return 0; +} +_ACEOF +for ac_lib in '' rt posix4; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_clock_gettime=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if ${ac_cv_search_clock_gettime+:} false; then : + break +fi +done +if ${ac_cv_search_clock_gettime+:} false; then : + +else + ac_cv_search_clock_gettime=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_clock_gettime" >&5 +$as_echo "$ac_cv_search_clock_gettime" >&6; } +ac_res=$ac_cv_search_clock_gettime +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + +fi + +for ac_func in clock_gettime +do : + ac_fn_c_check_func "$LINENO" "clock_gettime" "ac_cv_func_clock_gettime" +if test "x$ac_cv_func_clock_gettime" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_CLOCK_GETTIME 1 +_ACEOF + have_clock_gettime="yes" +else + have_clock_gettime="no" +fi +done + for ac_header in sys/resource.h sys/time.h unistd.h sys/ioctl.h sys/stat.h do : @@ -25729,6 +25806,15 @@ $as_echo "#define HAVE_THREADSAFE 1" >>confdefs.h fi +ac_fn_c_check_decl "$LINENO" "CLOCK_MONOTONIC" "ac_cv_have_decl_CLOCK_MONOTONIC" "#include +" +if test "x$ac_cv_have_decl_CLOCK_MONOTONIC" = xyes; then : + have_clock_monotonic="yes" +else + have_clock_monotonic="no" +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tm_gmtoff in struct tm" >&5 $as_echo_n "checking for tm_gmtoff in struct tm... " >&6; } diff --git a/configure.in b/configure.in index 10386b8..e7e292a 100644 --- a/configure.in +++ b/configure.in @@ -1344,11 +1344,14 @@ AC_HEADER_STDC AC_HEADER_TIME dnl ---------------------------------------------------------------------- -dnl Check for these two functions before is checked for, otherwise -dnl they are not detected correctly on Solaris [2.6]. +dnl Check for these two functions before the time headers are checked +dnl for, otherwise they are not detected correctly on Solaris (the +dnl configure test will fail due to multiply-defined symbols). dnl AC_CHECK_FUNCS(difftime) AC_CHECK_FUNCS(gettimeofday, [have_gettime="yes"], [have_gettime="no"]) +AC_SEARCH_LIBS([clock_gettime], [rt posix4]) +AC_CHECK_FUNCS([clock_gettime],[have_clock_gettime="yes"],[have_clock_gettime="no"]) dnl Unix AC_CHECK_HEADERS([sys/resource.h sys/time.h unistd.h sys/ioctl.h sys/stat.h]) @@ -2074,6 +2077,12 @@ if test "X$THREADSAFE" = "Xyes"; then fi dnl ---------------------------------------------------------------------- +dnl Check for MONOTONIC_TIMER support (used in clock_gettime). This has +dnl to be done after any POSIX/BSD defines to ensure that the test gets +dnl the correct POSIX level on linux. +AC_CHECK_DECL(CLOCK_MONOTONIC,[have_clock_monotonic="yes"],[have_clock_monotonic="no"],[[#include ]]) + +dnl ---------------------------------------------------------------------- dnl How does one figure out the local time zone? Anyone know of a dnl Posix way to do this? dnl diff --git a/src/H5config.h.in b/src/H5config.h.in index 487ac1d..a2059f5 100644 --- a/src/H5config.h.in +++ b/src/H5config.h.in @@ -68,6 +68,9 @@ /* Define if the compiler understands the __func__ keyword */ #undef HAVE_C99_FUNC +/* Define to 1 if you have the `clock_gettime' function. */ +#undef HAVE_CLOCK_GETTIME + /* Define if the function stack tracing code is to be compiled in */ #undef HAVE_CODESTACK diff --git a/vms/src/h5pubconf.h b/vms/src/h5pubconf.h index 67e7782..b262a6f 100644 --- a/vms/src/h5pubconf.h +++ b/vms/src/h5pubconf.h @@ -65,13 +65,13 @@ #define H5_FP_TO_ULLONG_RIGHT_MAXIMUM 1 /* Define if gettimeofday() populates the tz pointer passed in */ -/* #define H5_GETTIMEOFDAY_GIVES_TZ 1 */ +/* #undef H5_GETTIMEOFDAY_GIVES_TZ */ /* Define to 1 if you have the `alarm' function. */ #define H5_HAVE_ALARM 1 /* Define if the __attribute__(()) extension is present */ -/* #define H5_HAVE_ATTRIBUTE 1 */ +/* #undef H5_HAVE_ATTRIBUTE */ /* Define to 1 if you have the `BSDgettimeofday' function. */ /* #undef H5_HAVE_BSDGETTIMEOFDAY */ @@ -83,6 +83,9 @@ /* Define if the compiler understands the __func__ keyword */ #define H5_HAVE_C99_FUNC 1 +/* Define to 1 if you have the `clock_gettime' function. */ +#define H5_HAVE_CLOCK_GETTIME 1 + /* Define if the function stack tracing code is to be compiled in */ /* #undef H5_HAVE_CODESTACK */ @@ -103,10 +106,10 @@ /* #undef H5_HAVE_DMALLOC_H */ /* Define if library information should be embedded in the executables */ -/* #define H5_HAVE_EMBEDDED_LIBINFO 1 */ +/* #undef H5_HAVE_EMBEDDED_LIBINFO */ /* Define to 1 if you have the header file. */ -/* #define H5_HAVE_FEATURES_H 1 */ +/* #undef H5_HAVE_FEATURES_H */ /* Define if support for deflate (zlib) filter is enabled */ #define H5_HAVE_FILTER_DEFLATE 1 @@ -127,7 +130,7 @@ /* #undef H5_HAVE_FILTER_SZIP */ /* Define to 1 if you have the `fork' function. */ -/* #define H5_HAVE_FORK 1 */ +/* #undef H5_HAVE_FORK */ /* Define to 1 if you have the `frexpf' function. */ #define H5_HAVE_FREXPF 1 @@ -135,23 +138,23 @@ /* Define to 1 if you have the `frexpl' function. */ #define H5_HAVE_FREXPL 1 -/* Define to 1 if you have the `fseek64' function. */ -/* #undef H5_HAVE_FSEEK64 */ - /* Define to 1 if you have the `fseeko' function. */ #define H5_HAVE_FSEEKO 1 +/* Define to 1 if you have the `fseek64' function. */ +/* #undef H5_HAVE_FSEEKO64 */ + /* Define to 1 if you have the `fstat64' function. */ -/* #define H5_HAVE_FSTAT64 1 */ +/* #undef H5_HAVE_FSTAT64 */ /* Define to 1 if you have the `ftello' function. */ #define H5_HAVE_FTELLO 1 /* Define to 1 if you have the `ftruncate64' function. */ -/* #define H5_HAVE_FTRUNCATE64 1 */ +/* #undef H5_HAVE_FTRUNCATE64 */ /* Define if the compiler understands the __FUNCTION__ keyword */ -/* #define H5_HAVE_FUNCTION 1 */ +/* #undef H5_HAVE_FUNCTION */ /* Define to 1 if you have the `GetConsoleScreenBufferInfo' function. */ /* #undef H5_HAVE_GETCONSOLESCREENBUFFERINFO */ @@ -160,10 +163,10 @@ #define H5_HAVE_GETHOSTNAME 1 /* Define to 1 if you have the `getpwuid' function. */ -/* #define H5_HAVE_GETPWUID 1 */ +/* #undef H5_HAVE_GETPWUID */ /* Define to 1 if you have the `getrusage' function. */ -/* #define H5_HAVE_GETRUSAGE 1 */ +/* #undef H5_HAVE_GETRUSAGE */ /* Define to 1 if you have the `gettextinfo' function. */ /* #undef H5_HAVE_GETTEXTINFO */ @@ -227,16 +230,22 @@ /* #undef H5_HAVE_LIBSZ */ /* Define to 1 if you have the `z' library (-lz). */ -/* #define H5_HAVE_LIBZ 1 */ +/* #undef H5_HAVE_LIBZ */ /* Define to 1 if you have the `longjmp' function. */ #define H5_HAVE_LONGJMP 1 /* Define to 1 if you have the `lseek64' function. */ -/* #define H5_HAVE_LSEEK64 1 */ +/* #undef H5_HAVE_LSEEK64 */ /* Define to 1 if you have the `lstat' function. */ -/* #define H5_HAVE_LSTAT 1 */ +/* #undef H5_HAVE_LSTAT */ + +/* Define to 1 if you have the header file. */ +/* #undef H5_HAVE_MACH_MACH_TIME_H */ + +/* Define to 1 if you have the header file. */ +/* #undef H5_HAVE_MEMORY_H */ /* Define if we have MPE support */ /* #undef H5_HAVE_MPE */ @@ -277,6 +286,12 @@ /* Define to 1 if you have the `signal' function. */ #define H5_HAVE_SIGNAL 1 +/* Define to 1 if you have the `sigprocmask' function. */ +/* #undef H5_HAVE_SIGPROCMASK */ + +/* Define to 1 if you have the `sigsetjmp' function. */ +/* #undef H5_HAVE_SIGSETJMP */ + /* Define to 1 if you have the `snprintf' function. */ #define H5_HAVE_SNPRINTF 1 @@ -284,16 +299,16 @@ #define H5_HAVE_SRANDOM 1 /* Define to 1 if you have the `stat64' function. */ -/* #define H5_HAVE_STAT64 1 */ +/* #undef H5_HAVE_STAT64 */ /* Define if `struct stat' has the `st_blocks' field */ -/* #define H5_HAVE_STAT_ST_BLOCKS 1 */ +/* #undef H5_HAVE_STAT_ST_BLOCKS */ /* Define to 1 if you have the header file. */ #define H5_HAVE_STDDEF_H 1 /* Define to 1 if you have the header file. */ -/* #define H5_HAVE_STDINT_H 1 */ +/* #undef H5_HAVE_STDINT_H */ /* Define to 1 if you have the header file. */ #define H5_HAVE_STDLIB_H 1 @@ -311,7 +326,7 @@ /* #undef H5_HAVE_STRUCT_TEXT_INFO */ /* Define if `struct timezone' is defined */ -/* #define H5_HAVE_STRUCT_TIMEZONE 1 */ +/* #undef H5_HAVE_STRUCT_TIMEZONE */ /* Define to 1 if `tm_zone' is member of `struct tm'. */ #define H5_HAVE_STRUCT_TM_TM_ZONE 1 @@ -320,7 +335,7 @@ /* #undef H5_HAVE_STRUCT_VIDEOCONFIG */ /* Define to 1 if you have the `symlink' function. */ -/* #define H5_HAVE_SYMLINK 1 */ +/* #undef H5_HAVE_SYMLINK */ /* Define to 1 if you have the `system' function. */ #define H5_HAVE_SYSTEM 1 @@ -374,7 +389,7 @@ #define H5_HAVE_TMPFILE 1 /* Define if `tm_gmtoff' is a member of `struct tm' */ -/* #define H5_HAVE_TM_GMTOFF 1 */ +/* #undef H5_HAVE_TM_GMTOFF */ /* Define to 1 if your `struct tm' has `tm_zone'. Deprecated, use `HAVE_STRUCT_TM_TM_ZONE' instead. */ @@ -388,7 +403,7 @@ #define H5_HAVE_UNISTD_H 1 /* Define to 1 if you have the `vasprintf' function. */ -/* #define H5_HAVE_VASPRINTF 1 */ +/* #undef H5_HAVE_VASPRINTF */ /* Define to 1 if you have the `vsnprintf' function. */ #define H5_HAVE_VSNPRINTF 1 @@ -419,7 +434,7 @@ /* Define if your system can't handle converting floating-point values to long long. */ -/* #define H5_HW_FP_TO_LLONG_NOT_WORKS 1 */ +/* #undef H5_HW_FP_TO_LLONG_NOT_WORKS */ /* Define if HDF5's high-level library headers should be included in hdf5.h */ #define H5_INCLUDE_HL 1 @@ -438,6 +453,10 @@ values correctly. */ #define H5_LDOUBLE_TO_LLONG_ACCURATE 1 +/* Define if your system converts long double to (unsigned) long values with + special algorithm. */ +/* #undef H5_LDOUBLE_TO_LONG_SPECIAL */ + /* Define if your system can convert long double to unsigned int values correctly. */ #define H5_LDOUBLE_TO_UINT_ACCURATE 1 @@ -449,6 +468,10 @@ values correctly. */ #define H5_LLONG_TO_LDOUBLE_CORRECT 1 +/* Define if your system can convert (unsigned) long to long double values + with special algorithm. */ +/* #undef H5_LONG_TO_LDOUBLE_SPECIAL */ + /* Define to the sub-directory in which libtool stores uninstalled libraries. */ #define H5_LT_OBJDIR ".libs/" @@ -484,6 +507,9 @@ /* Define to the one symbol short name of this package. */ #define H5_PACKAGE_TARNAME "hdf5" +/* Define to the home page for this package. */ +#define H5_PACKAGE_URL "" + /* Define to the version of this package. */ #define H5_PACKAGE_VERSION "1.9.95" @@ -548,11 +574,14 @@ #define H5_SIZEOF_LONG_LONG 8 /* The size of `off64_t', as computed by sizeof. */ -/* #define H5_SIZEOF_OFF64_T 8 */ +#define H5_SIZEOF_OFF64_T 0 /* The size of `off_t', as computed by sizeof. */ #define H5_SIZEOF_OFF_T 8 +/* The size of `ptrdiff_t', as computed by sizeof. */ +#define H5_SIZEOF_PTRDIFF_T 4 + /* The size of `short', as computed by sizeof. */ #define H5_SIZEOF_SHORT 2 @@ -608,7 +637,7 @@ #define H5_STDC_HEADERS 1 /* Define if strict file format checks are enabled */ -/* #define H5_STRICT_FORMAT_CHECKS 1 */ +/* #undef H5_STRICT_FORMAT_CHECKS */ /* Define if your system supports pthread_attr_setscope(&attribute, PTHREAD_SCOPE_SYSTEM) call. */ @@ -628,6 +657,10 @@ correct precision. */ #define H5_ULLONG_TO_LDOUBLE_PRECISION 1 +/* Define if your system accurately converting unsigned long to float values. + */ +/* #undef H5_ULONG_TO_FLOAT_ACCURATE */ + /* Define if your system can accurately convert unsigned (long) long values to floating-point values. */ #define H5_ULONG_TO_FP_BOTTOM_BIT_ACCURATE 1 @@ -655,15 +688,13 @@ /* Define to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel and VAX). */ -/* #if defined AC_APPLE_UNIVERSAL_BUILD */ -/* # if defined __BIG_ENDIAN__ */ -/* # define WORDS_BIGENDIAN 1 */ -/* # endif */ -/* #else */ -/* # ifndef WORDS_BIGENDIAN */ -/* # undef WORDS_BIGENDIAN */ -/* # endif */ -/* #endif */ +/* #undef H5_WORDS_BIGENDIAN */ + +/* Number of bits in a file offset, on hosts where this is settable. */ +/* #undef H5__FILE_OFFSET_BITS */ + +/* Define for large files, on AIX-style hosts. */ +/* #undef H5__LARGE_FILES */ /* Define to empty if `const' does not conform to ANSI C. */ /* #undef H5_const */ @@ -677,6 +708,9 @@ /* Define to `long int' if does not define. */ /* #undef H5_off_t */ +/* Define to `long' if does not define. */ +/* #undef H5_ptrdiff_t */ + /* Define to `unsigned long' if does not define. */ /* #undef H5_size_t */ diff --git a/windows/src/H5pubconf.h b/windows/src/H5pubconf.h index 10d2c9a..87eae28 100644 --- a/windows/src/H5pubconf.h +++ b/windows/src/H5pubconf.h @@ -1,11 +1,28 @@ -/* windows/src/H5pubconf.h. Adapted from generated Linux src/H5pubconf.h */ -/* src/H5config.h. Generated from H5config.h.in by configure. */ -/* src/H5config.h.in. Generated from configure.in by autoheader. */ - -/* - * Windows Specific Definitions +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * Copyright by The HDF Group. * + * Copyright by the Board of Trustees of the University of Illinois. * + * All rights reserved. * + * * + * This file is part of HDF5. The full HDF5 copyright notice, including * + * terms governing use, modification, and redistribution, is contained in * + * the files COPYING and Copyright.html. COPYING can be found at the root * + * of the source code distribution tree; Copyright.html can be found at the * + * root level of an installed copy of the electronic HDF5 document set and * + * is linked from the top-level documents page. It can also be found at * + * http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have * + * access to either file, you may request a copy from help@hdfgroup.org. * + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + +/* NOTE: This file is created by hand from the Linux src/H5pubconf.h file. + * Most Windows builds are handled by CMake which generates its own + * H5pubconf.h file so this file can easily get out of date. Please notify + * Dana Robinson if the settings here have issues. */ +/******************************** + * Windows Specific Definitions * + ********************************/ + /* Define if the Windows virtual file driver should be compiled */ #define H5_HAVE_WINDOWS 1 @@ -15,16 +32,12 @@ /* Define if using a Windows compiler (i.e. Visual Studio) */ #define H5_HAVE_VISUAL_STUDIO 1 -/* Define if the Windows virtual file driver should use buffered IO functions */ -/* #undef WINDOWS_USE_STDIO */ +/*************************************** + * End of Windows Specific Definitions * + ***************************************/ -/* Define the maximum write size for the Windows file driver. Larger writes - will be split into many writes. Safe values are 1 <= WINDOWS_MAX_BUF <= 2GB-1. */ -#define WINDOWS_MAX_BUF (1024 * 1024 * 1024) - -/* - * End of Windows Specific Definitions - */ +/* Define if building universal (internal helper macro) */ +/* #undef H5_AC_APPLE_UNIVERSAL_BUILD */ /* Define if your system generates wrong code for log2 routine. */ /* #undef H5_BAD_LOG2_CODE_GENERATED */ @@ -74,7 +87,7 @@ /* Define if your system has right maximum convert floating-point to unsigned long long values. */ -/* #undef H5_FP_TO_ULLONG_RIGHT_MAXIMUM 1 */ +/* #undef H5_FP_TO_ULLONG_RIGHT_MAXIMUM */ /* Define if gettimeofday() populates the tz pointer passed in */ #define H5_GETTIMEOFDAY_GIVES_TZ 1 @@ -95,6 +108,9 @@ /* Define if the compiler understand the __func__ keyword */ /* #undef H5_HAVE_C99_FUNC */ +/* Define to 1 if you have the `clock_gettime' function. */ +/* #undef H5_HAVE_CLOCK_GETTIME */ + /* Define if the function stack tracing code is to be compiled in */ /* #undef H5_HAVE_CODESTACK */ @@ -114,6 +130,9 @@ /* Define to 1 if you have the header file. */ /* #undef H5_HAVE_DMALLOC_H */ +/* Define if library information should be embedded in the executables */ +/* #undef H5_HAVE_EMBEDDED_LIBINFO */ + /* Define to 1 if you have the header file. */ /* #undef H5_HAVE_FEATURES_H */ @@ -144,18 +163,24 @@ /* Define to 1 if you have the `frexpl' function. */ /* #undef H5_HAVE_FREXPL */ -/* Define to 1 if you have the `fseek64' function. */ -/* #undef H5_HAVE_FSEEK64 */ - /* Define to 1 if you have the `fseeko' function. */ /* #undef H5_HAVE_FSEEKO */ +/* Define to 1 if you have the `fseek64' function. */ +/* #undef H5_HAVE_FSEEKO64 */ + /* Define to 1 if you have the `fstat64' function. */ /* #undef H5_HAVE_FSTAT64 */ /* Define to 1 if you have the `ftello' function. */ /* #undef H5_HAVE_FTELLO */ +/* Define to 1 if you have the `ftello64' function. */ +/* #undef H5_HAVE_FTELLO64 */ + +/* Define to 1 if you have the `ftruncate64' function. */ +/* #undef H5_HAVE_FTRUNCATE64 */ + /* Define if the compiler understand the __FUNCTION__ keyword */ #define H5_HAVE_FUNCTION 1 @@ -169,7 +194,7 @@ /* #undef H5_HAVE_GETPWUID */ /* Define to 1 if you have the `getrusage' function. */ -/* #define H5_HAVE_GETRUSAGE 1 */ +/* #undef H5_HAVE_GETRUSAGE */ /* Define to 1 if you have the `gettextinfo' function. */ /* #undef H5_HAVE_GETTEXTINFO */ @@ -241,6 +266,15 @@ /* Define to 1 if you have the `lseek64' function. */ /* #undef H5_HAVE_LSEEK64 */ +/* Define to 1 if you have the `lstat' function. */ +/* #undef H5_HAVE_LSTAT */ + +/* Define to 1 if you have the header file. */ +/* #undef H5_HAVE_MACH_MACH_TIME_H */ + +/* Define to 1 if you have the header file. */ +/* #undef H5_HAVE_MEMORY_H */ + /* Define if we have MPE support */ /* #undef H5_HAVE_MPE */ @@ -274,15 +308,18 @@ /* Define to 1 if you have the `setsysinfo' function. */ /* #undef H5_HAVE_SETSYSINFO */ -/* Define to 1 if you have the `sigaction' function. */ -/* #undef H5_HAVE_SIGACTION */ - /* Define to 1 if you have the `siglongjmp' function. */ /* #undef H5_HAVE_SIGLONGJMP */ /* Define to 1 if you have the `signal' function. */ #define H5_HAVE_SIGNAL 1 +/* Define to 1 if you have the `sigprocmask' function. */ +/* #undef H5_HAVE_SIGPROCMASK */ + +/* Define to 1 if you have the `sigsetjmp' function. */ +/* #undef H5_HAVE_SIGSETJMP */ + /* Define to 1 if you have the `snprintf' function. */ /* #undef H5_HAVE_SNPRINTF */ @@ -325,6 +362,9 @@ /* Define if `struct videoconfig' is defined */ /* #undef H5_HAVE_STRUCT_VIDEOCONFIG */ +/* Define to 1 if you have the `symlink' function. */ +/* #undef H5_HAVE_SYMLINK */ + /* Define to 1 if you have the `system' function. */ #define H5_HAVE_SYSTEM 1 @@ -438,6 +478,10 @@ values correctly. */ #define H5_LDOUBLE_TO_LLONG_ACCURATE 1 +/* Define if your system converts long double to (unsigned) long values with + special algorithm. */ +/* #undef H5_LDOUBLE_TO_LONG_SPECIAL */ + /* Define if your system can convert long double to unsigned int values correctly. */ #define H5_LDOUBLE_TO_UINT_ACCURATE 1 @@ -449,6 +493,10 @@ values correctly. */ #define H5_LLONG_TO_LDOUBLE_CORRECT 1 +/* Define if your system can convert (unsigned) long to long double values + with special algorithm. */ +/* #undef H5_LONG_TO_LDOUBLE_SPECIAL */ + /* Define to the sub-directory in which libtool stores uninstalled libraries. */ #define H5_LT_OBJDIR ".libs/" @@ -484,6 +532,9 @@ /* Define to the one symbol short name of this package. */ #define H5_PACKAGE_TARNAME "hdf5" +/* Define to the home page for this package. */ +#define H5_PACKAGE_URL "" + /* Define to the version of this package. */ #define H5_PACKAGE_VERSION "1.9.95" @@ -553,6 +604,13 @@ /* The size of `off_t', as computed by sizeof. */ #define H5_SIZEOF_OFF_T 4 +/* The size of `ptrdiff_t', as computed by sizeof. */ +#ifndef _WIN64 +#define H5_SIZEOF_PTRDIFF_T 4 +#else +#define H5_SIZEOF_PTRDIFF_T 8 +#endif /* _WIN64 */ + /* The size of `short', as computed by sizeof. */ #define H5_SIZEOF_SHORT 2 @@ -602,6 +660,9 @@ /* The size of `uint_least8_t', as computed by sizeof. */ #define H5_SIZEOF_UINT_LEAST8_T 0 +/* The size of `unsigned', as computed by sizeof. */ +#define H5_SIZEOF_UNSIGNED 4 + /* The size of `__int64', as computed by sizeof. */ #define H5_SIZEOF___INT64 8 @@ -629,6 +690,10 @@ correct precision. */ #define H5_ULLONG_TO_LDOUBLE_PRECISION 1 +/* Define if your system accurately converting unsigned long to float values. + */ +/* #undef H5_ULONG_TO_FLOAT_ACCURATE */ + /* Define if your system can accurately convert unsigned (long) long values to floating-point values. */ /* #undef H5_ULONG_TO_FP_BOTTOM_BIT_ACCURATE */ @@ -658,6 +723,12 @@ first (like Motorola and SPARC, unlike Intel and VAX). */ /* #undef H5_WORDS_BIGENDIAN */ +/* Number of bits in a file offset, on hosts where this is settable. */ +/* #undef H5__FILE_OFFSET_BITS */ + +/* Define for large files, on AIX-style hosts. */ +/* #undef H5__LARGE_FILES */ + /* Define to empty if `const' does not conform to ANSI C. */ /* #undef H5_const */ @@ -670,8 +741,15 @@ /* Define to `long int' if does not define. */ /* #undef H5_off_t */ +/* Define to `long' if does not define. */ +/* #undef H5_ptrdiff_t */ + /* Define to `unsigned long' if does not define. */ /* #undef H5_size_t */ /* Define to `long' if does not define. */ +#ifndef _WIN64 #define H5_ssize_t long +#else +#define H5_ssize_t long long +#endif /* _WIN64 */ -- cgit v0.12