---------------------
PatchSet 11398 
Date: 2007/04/30 08:37:19
Author: hno
Branch: HEAD
Tag: (none) 
Log:
Portability: statfs() may requiore #include <sys/statfs.h>

Systems only implementing statfs() and not the newer statvfs() call may
need the sys/statfs.h include.

Members: 
	configure:1.441->1.442 
	configure.in:1.420->1.421 
	include/autoconf.h.in:1.162->1.163 
	src/store_dir.c:1.145->1.146 

Index: squid/configure
===================================================================
RCS file: /cvsroot/squid/squid/configure,v
retrieving revision 1.441
retrieving revision 1.442
diff -u -r1.441 -r1.442
--- squid/configure	4 Mar 2007 01:13:09 -0000	1.441
+++ squid/configure	30 Apr 2007 08:37:19 -0000	1.442
@@ -7298,6 +7298,7 @@
 
 
 
+
 for ac_header in sys/types.h \
 	stddef.h \
 	limits.h \
@@ -7355,6 +7356,7 @@
 	sys/poll.h \
 	sys/select.h \
 	sys/stat.h \
+	sys/statfs.h \
 	sys/statvfs.h \
 	syscall.h \
 	sys/syscall.h \
Index: squid/configure.in
===================================================================
RCS file: /cvsroot/squid/squid/configure.in,v
retrieving revision 1.420
retrieving revision 1.421
diff -u -r1.420 -r1.421
--- squid/configure.in	3 Mar 2007 18:25:31 -0000	1.420
+++ squid/configure.in	30 Apr 2007 08:37:20 -0000	1.421
@@ -1,7 +1,7 @@
 dnl
 dnl  Configuration input file for Squid
 dnl
-dnl  $Id: configure.in,v 1.420 2007/03/03 18:25:31 serassio Exp $
+dnl  $Id: configure.in,v 1.421 2007/04/30 08:37:20 hno Exp $
 dnl
 dnl
 dnl
@@ -10,7 +10,7 @@
 AM_CONFIG_HEADER(include/autoconf.h)
 AC_CONFIG_AUX_DIR(cfgaux)
 AM_INIT_AUTOMAKE
-AC_REVISION($Revision: 1.420 $)dnl
+AC_REVISION($Revision: 1.421 $)dnl
 AC_PREFIX_DEFAULT(/usr/local/squid)
 AM_MAINTAINER_MODE
 
@@ -1625,6 +1625,7 @@
 	sys/poll.h \
 	sys/select.h \
 	sys/stat.h \
+	sys/statfs.h \
 	sys/statvfs.h \
 	syscall.h \
 	sys/syscall.h \
Index: squid/include/autoconf.h.in
===================================================================
RCS file: /cvsroot/squid/squid/include/autoconf.h.in,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- squid/include/autoconf.h.in	3 Mar 2007 18:26:28 -0000	1.162
+++ squid/include/autoconf.h.in	30 Apr 2007 08:37:20 -0000	1.163
@@ -534,6 +534,9 @@
 /* Define to 1 if you have the <sys/socket.h> header file. */
 #undef HAVE_SYS_SOCKET_H
 
+/* Define to 1 if you have the <sys/statfs.h> header file. */
+#undef HAVE_SYS_STATFS_H
+
 /* Define to 1 if you have the <sys/statvfs.h> header file. */
 #undef HAVE_SYS_STATVFS_H
 
Index: squid/src/store_dir.c
===================================================================
RCS file: /cvsroot/squid/squid/src/store_dir.c,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- squid/src/store_dir.c	15 Apr 2007 16:10:43 -0000	1.145
+++ squid/src/store_dir.c	30 Apr 2007 08:37:21 -0000	1.146
@@ -1,6 +1,6 @@
 
 /*
- * $Id: store_dir.c,v 1.145 2007/04/15 16:10:43 hno Exp $
+ * $Id: store_dir.c,v 1.146 2007/04/30 08:37:21 hno Exp $
  *
  * DEBUG: section 47    Store Directory Routines
  * AUTHOR: Duane Wessels
@@ -44,6 +44,9 @@
 #if HAVE_SYS_VFS_H
 #include <sys/vfs.h>
 #endif
+#if HAVE_SYS_STATFS_H
+#include <sys/statfs.h>
+#endif
 
 static int storeDirValidSwapDirSize(int, squid_off_t);
 static STDIRSELECT storeDirSelectSwapDirRoundRobin;