r3994 - in branches/2.0/varnish-cache/bin: varnishd varnishhist varnishreplay

[tfheen at projects.linpro.no]

Author: tfheen
Date: 2009-03-23 15:18:09 +0100 (Mon, 23 Mar 2009)
New Revision: 3994

Modified:
   branches/2.0/varnish-cache/bin/varnishd/cache_pool.c
   branches/2.0/varnish-cache/bin/varnishhist/varnishhist.c
   branches/2.0/varnish-cache/bin/varnishreplay/varnishreplay.c
Log:
Merge r3964: Portability fixes from pkgsrc/NetBSD

Apply portability patches from pkgsrc, thanks to michael for
forwarding those.

Fixes #471



Modified: branches/2.0/varnish-cache/bin/varnishd/cache_pool.c
===================================================================
--- branches/2.0/varnish-cache/bin/varnishd/cache_pool.c	2009-03-23 12:59:52 UTC (rev 3993)
+++ branches/2.0/varnish-cache/bin/varnishd/cache_pool.c	2009-03-23 14:18:09 UTC (rev 3994)
@@ -48,7 +48,7 @@
 #include <sys/uio.h>
 
 #ifdef SENDFILE_WORKS
-#if defined(__FreeBSD__)
+#if defined(__FreeBSD__) || defined(__DragonFly__)
 #include <sys/socket.h>
 #elif defined(__linux__)
 #include <sys/sendfile.h>
@@ -208,7 +208,7 @@
 	assert(fd >= 0);
 	assert(len > 0);
 
-#if defined(__FreeBSD__)
+#if defined(__FreeBSD__) || defined(__DragonFly__)
 	do {
 		struct sf_hdtr sfh;
 		memset(&sfh, 0, sizeof sfh);

Modified: branches/2.0/varnish-cache/bin/varnishhist/varnishhist.c
===================================================================
--- branches/2.0/varnish-cache/bin/varnishhist/varnishhist.c	2009-03-23 12:59:52 UTC (rev 3993)
+++ branches/2.0/varnish-cache/bin/varnishhist/varnishhist.c	2009-03-23 14:18:09 UTC (rev 3994)
@@ -34,6 +34,7 @@
 
 #include "config.h"
 
+#include <sys/types.h>
 #include <curses.h>
 #include <errno.h>
 #include <limits.h>

Modified: branches/2.0/varnish-cache/bin/varnishreplay/varnishreplay.c
===================================================================
--- branches/2.0/varnish-cache/bin/varnishreplay/varnishreplay.c	2009-03-23 12:59:52 UTC (rev 3993)
+++ branches/2.0/varnish-cache/bin/varnishreplay/varnishreplay.c	2009-03-23 14:18:09 UTC (rev 3994)
@@ -30,6 +30,7 @@
 
 #include "config.h"
 
+#include <sys/types.h>
 #include <sys/signal.h>
 #include <sys/uio.h>