Mailing List Archive

Author: des
Date: 2007-02-20 09:46:45 +0100 (Tue, 20 Feb 2007)
New Revision: 1247

Modified:
branches/1.0/
branches/1.0/bin/varnishd/storage_file.c
branches/1.0/configure.ac
Log:
r34122 at cat (orig r1226): phk | 2006-12-05 09:47:43 +0100
NetBSD Portability fix:

Starting with 3.1, NetBSD uses statvfs and not statfs.

Submitted by: Juan RP <juan at xtrarom.org>




Property changes on: branches/1.0
___________________________________________________________________
Name: svk:merge
- d4fa192b-c00b-0410-8231-f00ffab90ce4:/trunk/varnish-cache:1222
+ d4fa192b-c00b-0410-8231-f00ffab90ce4:/trunk/varnish-cache:1226

Modified: branches/1.0/bin/varnishd/storage_file.c
===================================================================
--- branches/1.0/bin/varnishd/storage_file.c 2007-02-20 08:46:43 UTC (rev 1246)
+++ branches/1.0/bin/varnishd/storage_file.c 2007-02-20 08:46:45 UTC (rev 1247)
@@ -37,6 +37,11 @@
#include <sys/socket.h>
#include <sys/stat.h>

+#ifdef HAVE_SYS_STATVFS_H
+#include <sys/statvfs.h>
+#define statfs statvfs
+#endif
+
#ifdef HAVE_SYS_VFS_H
#include <sys/vfs.h>
#endif

Modified: branches/1.0/configure.ac
===================================================================
--- branches/1.0/configure.ac 2007-02-20 08:46:43 UTC (rev 1246)
+++ branches/1.0/configure.ac 2007-02-20 08:46:45 UTC (rev 1247)
@@ -45,6 +45,7 @@
AC_HEADER_SYS_WAIT
AC_HEADER_TIME
AC_CHECK_HEADERS([sys/socket.h])
+AC_CHECK_HEADERS([sys/statvfs.h])
AC_CHECK_HEADERS([sys/vfs.h])
AC_CHECK_HEADERS([netinet/in.h])
AC_CHECK_HEADERS([stddef.h])