PATCH: configure.ac and HAVE_SYS_TYPES.H

Gerald Pfeifer pfeifer at dbai.tuwien.ac.at
Sun Nov 10 04:57:58 CST 2002


On Thu, 7 Nov 2002, Gerald Pfeifer wrote:
> While debugging something, I noticed that we were not consistent here.

Here is an updated patch which takes the recent commit to this file into
account.

Gerald

ChangeLog:
Only #include <sys/types.h> if we actually HAVE_SYS_TYPES_H.

Index: configure.ac
===================================================================
RCS file: /home/wine/wine/configure.ac,v
retrieving revision 1.90
diff -u -3 -p -r1.90 configure.ac
--- configure.ac	8 Nov 2002 19:34:52 -0000	1.90
+++ configure.ac	10 Nov 2002 10:26:30 -0000
@@ -1040,7 +1040,9 @@ AC_HEADER_STAT()
 dnl **** Checks for headers that depend on other ones ****

 AC_CHECK_HEADERS(sys/mount.h sys/user.h,,,
-    [#include <sys/types.h>
+    [#if HAVE_SYS_TYPES_H
+     # include <sys/types.h>
+     #endif
      #if HAVE_SYS_PARAM_H
      # include <sys/param.h>
      #endif])
@@ -1153,7 +1155,9 @@ 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_TYPES_H
+	# include <sys/types.h>
+	#endif
 	#ifdef HAVE_SYS_PARAM_H
 	# include <sys/param.h>
 	#endif
@@ -1177,7 +1181,9 @@ 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_TYPES_H
+	# include <sys/types.h>
+	#endif
 	#ifdef HAVE_SYS_PARAM_H
 	# include <sys/param.h>
 	#endif
@@ -1199,7 +1205,9 @@ 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_TYPES_H
+	# include <sys/types.h>
+	#endif
 	#ifdef HAVE_SYS_PARAM_H
 	# include <sys/param.h>
 	#endif
@@ -1219,7 +1227,9 @@ fi
 dnl **** FIXME: what about mixed cases, where we need two of them? ***

 WINE_CHECK_STRUCT_MEMBER(statfs,f_bfree,
-[#include <sys/types.h>
+[#if HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
 #ifdef HAVE_SYS_PARAM_H
 # include <sys/param.h>
 #endif
@@ -1237,7 +1247,9 @@ WINE_CHECK_STRUCT_MEMBER(statfs,f_bfree,
     [AC_DEFINE(STATFS_HAS_BFREE, 1, [Define if the struct statfs has the member bfree])])

 WINE_CHECK_STRUCT_MEMBER(statfs,f_bavail,
-[#include <sys/types.h>
+[#if HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
 #ifdef HAVE_SYS_PARAM_H
 # include <sys/param.h>
 #endif





More information about the wine-patches mailing list