r2135 - in branches/1.1: . bin/varnishd

[des at projects.linpro.no]

Author: des
Date: 2007-10-19 13:19:21 +0200 (Fri, 19 Oct 2007)
New Revision: 2135

Modified:
   branches/1.1/
   branches/1.1/bin/varnishd/storage_file.c
   branches/1.1/configure.ac
Log:
Merged revisions 2133 via svnmerge from 
svn+ssh://projects.linpro.no/svn/varnish/trunk/varnish-cache

........
  r2133 | des | 2007-10-19 13:18:49 +0200 (Fri, 19 Oct 2007) | 2 lines
  
  Re-add Solaris support which was removed in r1465.
........



Property changes on: branches/1.1
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk/varnish-cache:1-1722,1727-1729,1738,1743-1777,1779-1798,1800-1808,1810-1815,1817,1819,1823,1830-1838,1846,1853-1855,1857-1859,1862,1865-1868,1871-1880,1883-1884,1886,1896,1898,1902-1905,1907,1909,1912-1916,1920-1928,1935-1939,1941-1949,1955,1957-1958,1967-1968,1970-1974,1976-1977,1984,1986-1989,1991-1998,2032-2033
   + /trunk/varnish-cache:1-1722,1727-1729,1738,1743-1777,1779-1798,1800-1808,1810-1815,1817,1819,1823,1830-1838,1846,1853-1855,1857-1859,1862,1865-1868,1871-1880,1883-1884,1886,1896,1898,1902-1905,1907,1909,1912-1916,1920-1928,1935-1939,1941-1949,1955,1957-1958,1967-1968,1970-1974,1976-1977,1984,1986-1989,1991-1998,2032-2033,2133

Modified: branches/1.1/bin/varnishd/storage_file.c
===================================================================
--- branches/1.1/bin/varnishd/storage_file.c	2007-10-19 11:19:12 UTC (rev 2134)
+++ branches/1.1/bin/varnishd/storage_file.c	2007-10-19 11:19:21 UTC (rev 2135)
@@ -41,6 +41,10 @@
 #include <sys/mount.h>
 #endif
 
+#ifdef HAVE_SYS_STATVFS_H
+#include <sys/statvfs.h>
+#endif
+
 #ifdef HAVE_SYS_VFS_H
 #include <sys/vfs.h>
 #endif

Modified: branches/1.1/configure.ac
===================================================================
--- branches/1.1/configure.ac	2007-10-19 11:19:12 UTC (rev 2134)
+++ branches/1.1/configure.ac	2007-10-19 11:19:21 UTC (rev 2135)
@@ -67,6 +67,7 @@
 AC_HEADER_TIME
 AC_CHECK_HEADERS([sys/socket.h])
 AC_CHECK_HEADERS([sys/mount.h])
+AC_CHECK_HEADERS([sys/statvfs.h])
 AC_CHECK_HEADERS([sys/vfs.h])
 AC_CHECK_HEADERS([netinet/in.h])
 AC_CHECK_HEADERS([stddef.h])