r1230 - trunk/varnish-cache/bin/varnishd

[knutroy at projects.linpro.no]

Author: knutroy
Date: 2006-12-18 16:58:59 +0100 (Mon, 18 Dec 2006)
New Revision: 1230

Modified:
   trunk/varnish-cache/bin/varnishd/storage_file.c
Log:
Fixed double declaraction error on systems having both HAVE_SYS_STATVFS_H and HAVE_SYS_VFS_H.


Modified: trunk/varnish-cache/bin/varnishd/storage_file.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/storage_file.c	2006-12-05 11:42:39 UTC (rev 1229)
+++ trunk/varnish-cache/bin/varnishd/storage_file.c	2006-12-18 15:58:59 UTC (rev 1230)
@@ -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)