From 55b74483def62ef10c4e13dd88d72ffafcf6e045 Mon Sep 17 00:00:00 2001 From: Robert Millan Date: Mon, 6 Feb 2006 21:53:27 +0100 Subject: [PATCH] configure: For sys/mount.h, sys/statfs.h and sys/vfs.h, always include them if present. --- configure | 417 ++++++++------------------------------ configure.ac | 86 +------- dlls/ntdll/file.c | 16 +- include/config.h.in | 9 - libs/port/fstatvfs.c | 16 +- libs/port/statvfs.c | 16 +- tools/winapi/winapi_check | 3 +- 7 files changed, 113 insertions(+), 450 deletions(-) diff --git a/configure b/configure index 0e04c81b732..1322de99398 100755 --- a/configure +++ b/configure @@ -16202,231 +16202,6 @@ _ACEOF fi -if test "$ac_cv_header_sys_vfs_h" = "yes" -then - echo "$as_me:$LINENO: checking whether sys/vfs.h defines statfs" >&5 -echo $ECHO_N "checking whether sys/vfs.h defines statfs... $ECHO_C" >&6 -if test "${wine_cv_sys_vfs_has_statfs+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - - #include - #ifdef HAVE_SYS_PARAM_H - # include - #endif - #include - -int -main () -{ - - struct statfs stfs; - - memset(&stfs,0,sizeof(stfs)); - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - wine_cv_sys_vfs_has_statfs=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -wine_cv_sys_vfs_has_statfs=no - -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - -fi -echo "$as_me:$LINENO: result: $wine_cv_sys_vfs_has_statfs" >&5 -echo "${ECHO_T}$wine_cv_sys_vfs_has_statfs" >&6 - if test "$wine_cv_sys_vfs_has_statfs" = "yes" - then - -cat >>confdefs.h <<\_ACEOF -#define STATFS_DEFINED_BY_SYS_VFS 1 -_ACEOF - - fi -fi - -if test "$ac_cv_header_sys_statfs_h" = "yes" -then - echo "$as_me:$LINENO: checking whether sys/statfs.h defines statfs" >&5 -echo $ECHO_N "checking whether sys/statfs.h defines statfs... $ECHO_C" >&6 -if test "${wine_cv_sys_statfs_has_statfs+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - - #include - #ifdef HAVE_SYS_PARAM_H - # include - #endif - #include - -int -main () -{ - - struct statfs stfs; - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - wine_cv_sys_statfs_has_statfs=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -wine_cv_sys_statfs_has_statfs=no - -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - -fi -echo "$as_me:$LINENO: result: $wine_cv_sys_statfs_has_statfs" >&5 -echo "${ECHO_T}$wine_cv_sys_statfs_has_statfs" >&6 - if test "$wine_cv_sys_statfs_has_statfs" = "yes" - then - -cat >>confdefs.h <<\_ACEOF -#define STATFS_DEFINED_BY_SYS_STATFS 1 -_ACEOF - - fi -fi - -if test "$ac_cv_header_sys_mount_h" = "yes" -then - echo "$as_me:$LINENO: checking whether sys/mount.h defines statfs" >&5 -echo $ECHO_N "checking whether sys/mount.h defines statfs... $ECHO_C" >&6 -if test "${wine_cv_sys_mount_has_statfs+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - - #include - #ifdef HAVE_SYS_PARAM_H - # include - #endif - #include - -int -main () -{ - - struct statfs stfs; - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - wine_cv_sys_mount_has_statfs=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -wine_cv_sys_mount_has_statfs=no - -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - -fi -echo "$as_me:$LINENO: result: $wine_cv_sys_mount_has_statfs" >&5 -echo "${ECHO_T}$wine_cv_sys_mount_has_statfs" >&6 - if test "$wine_cv_sys_mount_has_statfs" = "yes" - then - -cat >>confdefs.h <<\_ACEOF -#define STATFS_DEFINED_BY_SYS_MOUNT 1 -_ACEOF - - fi -fi - - echo "$as_me:$LINENO: checking for struct statfs.f_bfree" >&5 echo $ECHO_N "checking for struct statfs.f_bfree... $ECHO_C" >&6 if test "${ac_cv_member_struct_statfs_f_bfree+set}" = set; then @@ -16442,16 +16217,14 @@ cat >>conftest.$ac_ext <<_ACEOF #ifdef HAVE_SYS_PARAM_H # include #endif -#ifdef STATFS_DEFINED_BY_SYS_MOUNT +#ifdef HAVE_SYS_MOUNT_H # include -#else -# ifdef STATFS_DEFINED_BY_SYS_VFS -# include -# else -# ifdef STATFS_DEFINED_BY_SYS_STATFS -# include -# endif -# endif +#endif +#ifdef HAVE_SYS_VFS_H +# include +#endif +#ifdef HAVE_SYS_STATFS_H +# include #endif int @@ -16500,16 +16273,14 @@ cat >>conftest.$ac_ext <<_ACEOF #ifdef HAVE_SYS_PARAM_H # include #endif -#ifdef STATFS_DEFINED_BY_SYS_MOUNT +#ifdef HAVE_SYS_MOUNT_H # include -#else -# ifdef STATFS_DEFINED_BY_SYS_VFS -# include -# else -# ifdef STATFS_DEFINED_BY_SYS_STATFS -# include -# endif -# endif +#endif +#ifdef HAVE_SYS_VFS_H +# include +#endif +#ifdef HAVE_SYS_STATFS_H +# include #endif int @@ -16579,16 +16350,14 @@ cat >>conftest.$ac_ext <<_ACEOF #ifdef HAVE_SYS_PARAM_H # include #endif -#ifdef STATFS_DEFINED_BY_SYS_MOUNT +#ifdef HAVE_SYS_MOUNT_H # include -#else -# ifdef STATFS_DEFINED_BY_SYS_VFS -# include -# else -# ifdef STATFS_DEFINED_BY_SYS_STATFS -# include -# endif -# endif +#endif +#ifdef HAVE_SYS_VFS_H +# include +#endif +#ifdef HAVE_SYS_STATFS_H +# include #endif int @@ -16637,16 +16406,14 @@ cat >>conftest.$ac_ext <<_ACEOF #ifdef HAVE_SYS_PARAM_H # include #endif -#ifdef STATFS_DEFINED_BY_SYS_MOUNT +#ifdef HAVE_SYS_MOUNT_H # include -#else -# ifdef STATFS_DEFINED_BY_SYS_VFS -# include -# else -# ifdef STATFS_DEFINED_BY_SYS_STATFS -# include -# endif -# endif +#endif +#ifdef HAVE_SYS_VFS_H +# include +#endif +#ifdef HAVE_SYS_STATFS_H +# include #endif int @@ -16716,16 +16483,14 @@ cat >>conftest.$ac_ext <<_ACEOF #ifdef HAVE_SYS_PARAM_H # include #endif -#ifdef STATFS_DEFINED_BY_SYS_MOUNT +#ifdef HAVE_SYS_MOUNT_H # include -#else -# ifdef STATFS_DEFINED_BY_SYS_VFS -# include -# else -# ifdef STATFS_DEFINED_BY_SYS_STATFS -# include -# endif -# endif +#endif +#ifdef HAVE_SYS_VFS_H +# include +#endif +#ifdef HAVE_SYS_STATFS_H +# include #endif int @@ -16774,16 +16539,14 @@ cat >>conftest.$ac_ext <<_ACEOF #ifdef HAVE_SYS_PARAM_H # include #endif -#ifdef STATFS_DEFINED_BY_SYS_MOUNT +#ifdef HAVE_SYS_MOUNT_H # include -#else -# ifdef STATFS_DEFINED_BY_SYS_VFS -# include -# else -# ifdef STATFS_DEFINED_BY_SYS_STATFS -# include -# endif -# endif +#endif +#ifdef HAVE_SYS_VFS_H +# include +#endif +#ifdef HAVE_SYS_STATFS_H +# include #endif int @@ -16853,16 +16616,14 @@ cat >>conftest.$ac_ext <<_ACEOF #ifdef HAVE_SYS_PARAM_H # include #endif -#ifdef STATFS_DEFINED_BY_SYS_MOUNT +#ifdef HAVE_SYS_MOUNT_H # include -#else -# ifdef STATFS_DEFINED_BY_SYS_VFS -# include -# else -# ifdef STATFS_DEFINED_BY_SYS_STATFS -# include -# endif -# endif +#endif +#ifdef HAVE_SYS_VFS_H +# include +#endif +#ifdef HAVE_SYS_STATFS_H +# include #endif int @@ -16911,16 +16672,14 @@ cat >>conftest.$ac_ext <<_ACEOF #ifdef HAVE_SYS_PARAM_H # include #endif -#ifdef STATFS_DEFINED_BY_SYS_MOUNT +#ifdef HAVE_SYS_MOUNT_H # include -#else -# ifdef STATFS_DEFINED_BY_SYS_VFS -# include -# else -# ifdef STATFS_DEFINED_BY_SYS_STATFS -# include -# endif -# endif +#endif +#ifdef HAVE_SYS_VFS_H +# include +#endif +#ifdef HAVE_SYS_STATFS_H +# include #endif int @@ -16990,16 +16749,14 @@ cat >>conftest.$ac_ext <<_ACEOF #ifdef HAVE_SYS_PARAM_H # include #endif -#ifdef STATFS_DEFINED_BY_SYS_MOUNT +#ifdef HAVE_SYS_MOUNT_H # include -#else -# ifdef STATFS_DEFINED_BY_SYS_VFS -# include -# else -# ifdef STATFS_DEFINED_BY_SYS_STATFS -# include -# endif -# endif +#endif +#ifdef HAVE_SYS_VFS_H +# include +#endif +#ifdef HAVE_SYS_STATFS_H +# include #endif int @@ -17048,16 +16805,14 @@ cat >>conftest.$ac_ext <<_ACEOF #ifdef HAVE_SYS_PARAM_H # include #endif -#ifdef STATFS_DEFINED_BY_SYS_MOUNT +#ifdef HAVE_SYS_MOUNT_H # include -#else -# ifdef STATFS_DEFINED_BY_SYS_VFS -# include -# else -# ifdef STATFS_DEFINED_BY_SYS_STATFS -# include -# endif -# endif +#endif +#ifdef HAVE_SYS_VFS_H +# include +#endif +#ifdef HAVE_SYS_STATFS_H +# include #endif int @@ -17127,16 +16882,14 @@ cat >>conftest.$ac_ext <<_ACEOF #ifdef HAVE_SYS_PARAM_H # include #endif -#ifdef STATFS_DEFINED_BY_SYS_MOUNT +#ifdef HAVE_SYS_MOUNT_H # include -#else -# ifdef STATFS_DEFINED_BY_SYS_VFS -# include -# else -# ifdef STATFS_DEFINED_BY_SYS_STATFS -# include -# endif -# endif +#endif +#ifdef HAVE_SYS_VFS_H +# include +#endif +#ifdef HAVE_SYS_STATFS_H +# include #endif int @@ -17185,16 +16938,14 @@ cat >>conftest.$ac_ext <<_ACEOF #ifdef HAVE_SYS_PARAM_H # include #endif -#ifdef STATFS_DEFINED_BY_SYS_MOUNT +#ifdef HAVE_SYS_MOUNT_H # include -#else -# ifdef STATFS_DEFINED_BY_SYS_VFS -# include -# else -# ifdef STATFS_DEFINED_BY_SYS_STATFS -# include -# endif -# endif +#endif +#ifdef HAVE_SYS_VFS_H +# include +#endif +#ifdef HAVE_SYS_STATFS_H +# include #endif int diff --git a/configure.ac b/configure.ac index d808c8854dd..5786a92f6e2 100644 --- a/configure.ac +++ b/configure.ac @@ -1312,76 +1312,6 @@ then fi fi -dnl **** statfs checks **** - -if test "$ac_cv_header_sys_vfs_h" = "yes" -then - AC_CACHE_CHECK( [whether sys/vfs.h defines statfs], - wine_cv_sys_vfs_has_statfs, - AC_TRY_COMPILE([ - #include - #ifdef HAVE_SYS_PARAM_H - # include - #endif - #include - ],[ - struct statfs stfs; - - memset(&stfs,0,sizeof(stfs)); - ],wine_cv_sys_vfs_has_statfs=yes,wine_cv_sys_vfs_has_statfs=no - ) - ) - if test "$wine_cv_sys_vfs_has_statfs" = "yes" - then - AC_DEFINE(STATFS_DEFINED_BY_SYS_VFS, 1, - [Define if the struct statfs is defined by ]) - fi -fi - -if test "$ac_cv_header_sys_statfs_h" = "yes" -then - AC_CACHE_CHECK( [whether sys/statfs.h defines statfs], - wine_cv_sys_statfs_has_statfs, - AC_TRY_COMPILE([ - #include - #ifdef HAVE_SYS_PARAM_H - # include - #endif - #include - ],[ - struct statfs stfs; - ],wine_cv_sys_statfs_has_statfs=yes,wine_cv_sys_statfs_has_statfs=no - ) - ) - if test "$wine_cv_sys_statfs_has_statfs" = "yes" - then - AC_DEFINE(STATFS_DEFINED_BY_SYS_STATFS, 1, - [Define if the struct statfs is defined by ]) - fi -fi - -if test "$ac_cv_header_sys_mount_h" = "yes" -then - AC_CACHE_CHECK( [whether sys/mount.h defines statfs], - wine_cv_sys_mount_has_statfs, - AC_TRY_COMPILE([ - #include - #ifdef HAVE_SYS_PARAM_H - # include - #endif - #include - ],[ - struct statfs stfs; - ],wine_cv_sys_mount_has_statfs=yes,wine_cv_sys_mount_has_statfs=no - ) - ) - if test "$wine_cv_sys_mount_has_statfs" = "yes" - then - AC_DEFINE(STATFS_DEFINED_BY_SYS_MOUNT, 1, - [Define if the struct statfs is defined by ]) - fi -fi - dnl **** FIXME: what about mixed cases, where we need two of them? *** dnl Check for statfs members @@ -1390,16 +1320,14 @@ AC_CHECK_MEMBERS([struct statfs.f_bfree, struct statfs.f_bavail, struct statfs.f #ifdef HAVE_SYS_PARAM_H # include #endif -#ifdef STATFS_DEFINED_BY_SYS_MOUNT +#ifdef HAVE_SYS_MOUNT_H # include -#else -# ifdef STATFS_DEFINED_BY_SYS_VFS -# include -# else -# ifdef STATFS_DEFINED_BY_SYS_STATFS -# include -# endif -# endif +#endif +#ifdef HAVE_SYS_VFS_H +# include +#endif +#ifdef HAVE_SYS_STATFS_H +# include #endif]) AC_CHECK_MEMBERS([struct statvfs.f_blocks],,, diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 2293800a374..bbeb27f53b0 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -45,16 +45,14 @@ #ifdef HAVE_UTIME_H # include #endif -#ifdef STATFS_DEFINED_BY_SYS_VFS +#ifdef HAVE_SYS_VFS_H # include -#else -# ifdef STATFS_DEFINED_BY_SYS_MOUNT -# include -# else -# ifdef STATFS_DEFINED_BY_SYS_STATFS -# include -# endif -# endif +#endif +#ifdef HAVE_SYS_MOUNT_H +# include +#endif +#ifdef HAVE_SYS_STATFS_H +# include #endif #ifdef HAVE_IOKIT_IOKITLIB_H diff --git a/include/config.h.in b/include/config.h.in index 644f2808692..c9372268ecf 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -968,15 +968,6 @@ /* Define to the soname of the libXrender library. */ #undef SONAME_LIBXRENDER -/* Define if the struct statfs is defined by */ -#undef STATFS_DEFINED_BY_SYS_MOUNT - -/* Define if the struct statfs is defined by */ -#undef STATFS_DEFINED_BY_SYS_STATFS - -/* Define if the struct statfs is defined by */ -#undef STATFS_DEFINED_BY_SYS_VFS - /* Define to 1 if the `S_IS*' macros in do not work properly. */ #undef STAT_MACROS_BROKEN diff --git a/libs/port/fstatvfs.c b/libs/port/fstatvfs.c index a6ba691e1af..47e655d45ef 100644 --- a/libs/port/fstatvfs.c +++ b/libs/port/fstatvfs.c @@ -29,16 +29,14 @@ #ifdef HAVE_SYS_PARAM_H # include #endif -#ifdef STATFS_DEFINED_BY_SYS_VFS +#ifdef HAVE_SYS_VFS_H # include -#else -# ifdef STATFS_DEFINED_BY_SYS_MOUNT -# include -# else -# ifdef STATFS_DEFINED_BY_SYS_STATFS -# include -# endif -# endif +#endif +#ifdef HAVE_SYS_MOUNT_H +# include +#endif +#ifdef HAVE_SYS_STATFS_H +# include #endif int fstatvfs( int fd, struct statvfs *buf ) diff --git a/libs/port/statvfs.c b/libs/port/statvfs.c index 9d672119aed..a67accdf7df 100644 --- a/libs/port/statvfs.c +++ b/libs/port/statvfs.c @@ -29,16 +29,14 @@ #ifdef HAVE_SYS_PARAM_H # include #endif -#ifdef STATFS_DEFINED_BY_SYS_VFS +#ifdef HAVE_SYS_VFS_H # include -#else -# ifdef STATFS_DEFINED_BY_SYS_MOUNT -# include -# else -# ifdef STATFS_DEFINED_BY_SYS_STATFS -# include -# endif -# endif +#endif +#ifdef HAVE_SYS_MOUNT_H +# include +#endif +#ifdef HAVE_SYS_STATFS_H +# include #endif int statvfs( const char *path, struct statvfs *buf ) diff --git a/tools/winapi/winapi_check b/tools/winapi/winapi_check index 1ef85ddce3d..183b13baaab 100755 --- a/tools/winapi/winapi_check +++ b/tools/winapi/winapi_check @@ -581,8 +581,7 @@ foreach my $file (@c_files) { } elsif($macro =~ /^HAVE_(.*?)_H$/) { my $name = $1; if($header !~ /^alloca\.h$/ && - $file_dir !~ /tests$/ && - !$preprocessor->is_def("STATFS_DEFINED_BY_$name")) + $file_dir !~ /tests$/) { $output->write("$file: #$directive $argument: is a conditional include, " . "but is not protected\n");