r1465 - in trunk/varnish-cache: . bin/varnishd

[des at projects.linpro.no]

Author: des
Date: 2007-05-22 18:02:15 +0200 (Tue, 22 May 2007)
New Revision: 1465

Modified:
   trunk/varnish-cache/bin/varnishd/storage_file.c
   trunk/varnish-cache/configure.ac
Log:
Fix compilation on OpenBSD 4.1.


Modified: trunk/varnish-cache/bin/varnishd/storage_file.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/storage_file.c	2007-05-22 15:35:54 UTC (rev 1464)
+++ trunk/varnish-cache/bin/varnishd/storage_file.c	2007-05-22 16:02:15 UTC (rev 1465)
@@ -37,8 +37,8 @@
 #include <sys/socket.h>
 #include <sys/stat.h>
 
-#ifdef HAVE_SYS_STATVFS_H
-#include <sys/statvfs.h>
+#ifdef HAVE_SYS_MOUNT_H
+#include <sys/mount.h>
 #endif
 
 #ifdef HAVE_SYS_VFS_H
@@ -126,7 +126,7 @@
 	AN(sc);
 	AZ(fstat(sc->fd, &st));
 
-#if defined(HAVE_SYS_STATVFS_H) || defined(HAVE_SYS_VFS_H)
+#if defined(HAVE_SYS_MOUNT_H) || defined(HAVE_SYS_VFS_H)
 	struct statfs fsst;
 	AZ(fstatfs(sc->fd, &fsst));
 #endif

Modified: trunk/varnish-cache/configure.ac
===================================================================
--- trunk/varnish-cache/configure.ac	2007-05-22 15:35:54 UTC (rev 1464)
+++ trunk/varnish-cache/configure.ac	2007-05-22 16:02:15 UTC (rev 1465)
@@ -55,7 +55,7 @@
 AC_HEADER_SYS_WAIT
 AC_HEADER_TIME
 AC_CHECK_HEADERS([sys/socket.h])
-AC_CHECK_HEADERS([sys/statvfs.h])
+AC_CHECK_HEADERS([sys/mount.h])
 AC_CHECK_HEADERS([sys/vfs.h])
 AC_CHECK_HEADERS([netinet/in.h])
 AC_CHECK_HEADERS([stddef.h])