Mailing List Archive

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

Modified:
branches/1.0/
branches/1.0/bin/varnishd/storage_file.c
Log:
r34126 at cat (orig r1230): knutroy | 2006-12-18 16:58:59 +0100
Fixed double declaraction error on systems having both HAVE_SYS_STATVFS_H and HAVE_SYS_VFS_H.




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

Modified: branches/1.0/bin/varnishd/storage_file.c
===================================================================
--- branches/1.0/bin/varnishd/storage_file.c 2007-02-20 08:46:48 UTC (rev 1250)
+++ branches/1.0/bin/varnishd/storage_file.c 2007-02-20 08:46:50 UTC (rev 1251)
@@ -126,16 +126,11 @@
AN(sc != NULL);
AZ(fstat(sc->fd, &st));

-#ifdef HAVE_SYS_STATVFS_H
+#if defined(HAVE_SYS_STATVFS_H) || defined(HAVE_SYS_VFS_H)
struct statfs fsst;
AZ(fstatfs(sc->fd, &fsst));
#endif

-#ifdef HAVE_SYS_VFS_H
- struct statfs fsst;
- AZ(fstatfs(sc->fd, &fsst));
-#endif
-
/* We use units of the larger of filesystem blocksize and pagesize */
bs = sc->pagesize;
if (bs < fsst.f_bsize)