From: knutroy <knutroy@d4fa192b-c00b-0410-8231-f00ffab90ce4>
Date: Mon, 18 Dec 2006 15:58:59 +0000 (+0000)
Subject: Fixed double declaraction error on systems having both HAVE_SYS_STATVFS_H and HAVE_SY... 
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8425fed892f7dbba8af91c6f215ead07b3e1d71e;p=varnish

Fixed double declaraction error on systems having both HAVE_SYS_STATVFS_H and HAVE_SYS_VFS_H.


git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@1230 d4fa192b-c00b-0410-8231-f00ffab90ce4
---

diff --git a/varnish-cache/bin/varnishd/storage_file.c b/varnish-cache/bin/varnishd/storage_file.c
index 3209f7da..229cfe54 100644
--- a/varnish-cache/bin/varnishd/storage_file.c
+++ b/varnish-cache/bin/varnishd/storage_file.c
@@ -126,12 +126,7 @@ smf_calcsize(struct smf_sc *sc, const char *size, int newfile)
 	AN(sc != NULL);
 	AZ(fstat(sc->fd, &st));
 
-#ifdef HAVE_SYS_STATVFS_H
-	struct statfs fsst;
-	AZ(fstatfs(sc->fd, &fsst));
-#endif
-
-#ifdef HAVE_SYS_VFS_H
+#if defined(HAVE_SYS_STATVFS_H) || defined(HAVE_SYS_VFS_H)
 	struct statfs fsst;
 	AZ(fstatfs(sc->fd, &fsst));
 #endif