diff options
-rwxr-xr-x | configure | 63 | ||||
-rw-r--r-- | configure.in | 7 | ||||
-rw-r--r-- | src/H5FDwindows.c | 4 | ||||
-rw-r--r-- | src/H5config.h.in | 3 |
4 files changed, 73 insertions, 4 deletions
@@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Id: configure.in 13846 2007-06-08 13:12:13Z mcgreevy . +# From configure.in Id: configure.in 13850 2007-06-11 18:51:20Z koziol . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for HDF5 1.8.0-beta1post1. # @@ -1645,7 +1645,7 @@ Optional Packages: --with-pthread=DIR Use the Pthreads library [default=no] --with-mpe=DIR Use MPE instrumentation [default=no] --with-default-vfd=driver - Specify default file driver [default=] + Specify default file driver [default=sec2] Some influential environment variables: CC C compiler command @@ -47767,6 +47767,65 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: checking for __offsetof__ extension" >&5 +echo $ECHO_N "checking for __offsetof__ extension... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#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 () +{ +size_t __offsetof__(unused) + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_OFFSETOF 1 +_ACEOF + + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + { echo "$as_me:$LINENO: checking how to print long long" >&5 echo $ECHO_N "checking how to print long long... $ECHO_C" >&6; } if test "${hdf5_cv_printf_ll+set}" = set; then diff --git a/configure.in b/configure.in index b7caccd..71fd657 100644 --- a/configure.in +++ b/configure.in @@ -1932,6 +1932,13 @@ AC_TRY_COMPILE(,[(void)__FUNCTION__], AC_MSG_RESULT([yes]), AC_MSG_RESULT([no])) +AC_MSG_CHECKING([for __offsetof__ extension]) +AC_TRY_COMPILE(,[size_t __offsetof__(unused)], + AC_DEFINE([HAVE_OFFSETOF], [1], + [Define if the __offsetof__ extension is present]) + AC_MSG_RESULT([yes]), + AC_MSG_RESULT([no])) + dnl ---------------------------------------------------------------------- dnl Try to figure out how to print `long long'. Some machines use `%lld' dnl and others use `%qd'. There may be more! The final `l' is a diff --git a/src/H5FDwindows.c b/src/H5FDwindows.c index 43afcef..1ea9aad 100644 --- a/src/H5FDwindows.c +++ b/src/H5FDwindows.c @@ -276,8 +276,8 @@ H5FD_windows_term(void) *
*-------------------------------------------------------------------------
*/
-herr_t
-H5Pset_fapl_windows(hid_t fapl_id)
+herr_t +H5Pset_fapl_windows(hid_t fapl_id) {
H5P_genplist_t *plist; /* Property list pointer */
herr_t ret_value;
diff --git a/src/H5config.h.in b/src/H5config.h.in index a3a8c30..3eea9ff 100644 --- a/src/H5config.h.in +++ b/src/H5config.h.in @@ -228,6 +228,9 @@ /* Define to 1 if you have the <netinet/tcp.h> header file. */ #undef HAVE_NETINET_TCP_H +/* Define if the __offsetof__ extension is present */ +#undef HAVE_OFFSETOF + /* Define if we have parallel support */ #undef HAVE_PARALLEL |