configure: For sys/mount.h, sys/statfs.h and sys/vfs.h, always include

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 <sys/types.h>
-	#ifdef HAVE_SYS_PARAM_H
-	# include <sys/param.h>
-	#endif
-	#include <sys/vfs.h>
-	],[
-		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 <sys/vfs.h>])
-    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 <sys/types.h>
-	#ifdef HAVE_SYS_PARAM_H
-	# include <sys/param.h>
-	#endif
-	#include <sys/statfs.h>
-	],[
-		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 <sys/statfs.h>])
-    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 <sys/types.h>
-	#ifdef HAVE_SYS_PARAM_H
-	# include <sys/param.h>
-	#endif
-	#include <sys/mount.h>
-	],[
-		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 <sys/mount.h>])
-    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 <sys/param.h>
 #endif
-#ifdef STATFS_DEFINED_BY_SYS_MOUNT
+#ifdef HAVE_SYS_MOUNT_H
 # include <sys/mount.h>
-#else
-# ifdef STATFS_DEFINED_BY_SYS_VFS
-#  include <sys/vfs.h>
-# else
-#  ifdef STATFS_DEFINED_BY_SYS_STATFS
-#   include <sys/statfs.h>
-#  endif
-# endif
+#endif
+#ifdef HAVE_SYS_VFS_H
+# include <sys/vfs.h>
+#endif
+#ifdef HAVE_SYS_STATFS_H
+# include <sys/statfs.h>
 #endif])
 
 AC_CHECK_MEMBERS([struct statvfs.f_blocks],,,

dlls/ntdll/file.c

@@ -45,16 +45,14 @@
 #ifdef HAVE_UTIME_H
 # include <utime.h>
 #endif
-#ifdef STATFS_DEFINED_BY_SYS_VFS
+#ifdef HAVE_SYS_VFS_H
 # include <sys/vfs.h>
-#else
-# ifdef STATFS_DEFINED_BY_SYS_MOUNT
-#  include <sys/mount.h>
-# else
-#  ifdef STATFS_DEFINED_BY_SYS_STATFS
-#   include <sys/statfs.h>
-#  endif
-# endif
+#endif
+#ifdef HAVE_SYS_MOUNT_H
+# include <sys/mount.h>
+#endif
+#ifdef HAVE_SYS_STATFS_H
+# include <sys/statfs.h>
 #endif
 
 #ifdef HAVE_IOKIT_IOKITLIB_H

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 <sys/mount.h> */
-#undef STATFS_DEFINED_BY_SYS_MOUNT
-
-/* Define if the struct statfs is defined by <sys/statfs.h> */
-#undef STATFS_DEFINED_BY_SYS_STATFS
-
-/* Define if the struct statfs is defined by <sys/vfs.h> */
-#undef STATFS_DEFINED_BY_SYS_VFS
-
 /* Define to 1 if the `S_IS*' macros in <sys/stat.h> do not work properly. */
 #undef STAT_MACROS_BROKEN
 

libs/port/fstatvfs.c

@@ -29,16 +29,14 @@
 #ifdef HAVE_SYS_PARAM_H
 # include <sys/param.h>
 #endif
-#ifdef STATFS_DEFINED_BY_SYS_VFS
+#ifdef HAVE_SYS_VFS_H
 # include <sys/vfs.h>
-#else
-# ifdef STATFS_DEFINED_BY_SYS_MOUNT
-#  include <sys/mount.h>
-# else
-#  ifdef STATFS_DEFINED_BY_SYS_STATFS
-#   include <sys/statfs.h>
-#  endif
-# endif
+#endif
+#ifdef HAVE_SYS_MOUNT_H
+# include <sys/mount.h>
+#endif
+#ifdef HAVE_SYS_STATFS_H
+# include <sys/statfs.h>
 #endif
 
 int fstatvfs( int fd, struct statvfs *buf )

libs/port/statvfs.c

@@ -29,16 +29,14 @@
 #ifdef HAVE_SYS_PARAM_H
 # include <sys/param.h>
 #endif
-#ifdef STATFS_DEFINED_BY_SYS_VFS
+#ifdef HAVE_SYS_VFS_H
 # include <sys/vfs.h>
-#else
-# ifdef STATFS_DEFINED_BY_SYS_MOUNT
-#  include <sys/mount.h>
-# else
-#  ifdef STATFS_DEFINED_BY_SYS_STATFS
-#   include <sys/statfs.h>
-#  endif
-# endif
+#endif
+#ifdef HAVE_SYS_MOUNT_H
+# include <sys/mount.h>
+#endif
+#ifdef HAVE_SYS_STATFS_H
+# include <sys/statfs.h>
 #endif
 
 int statvfs( const char *path, struct statvfs *buf )

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");