r4027 - in trunk/varnish-cache: bin/varnishd lib/libjemalloc

[des at projects.linpro.no]

Author: des
Date: 2009-04-04 00:00:00 +0200 (Sat, 04 Apr 2009)
New Revision: 4027

Modified:
   trunk/varnish-cache/bin/varnishd/Makefile.am
   trunk/varnish-cache/bin/varnishd/cache_http.c
   trunk/varnish-cache/lib/libjemalloc/jemalloc_linux.c
   trunk/varnish-cache/lib/libjemalloc/malloc.c
Log:
Unused includes.


Modified: trunk/varnish-cache/bin/varnishd/Makefile.am
===================================================================
--- trunk/varnish-cache/bin/varnishd/Makefile.am	2009-04-03 21:54:25 UTC (rev 4026)
+++ trunk/varnish-cache/bin/varnishd/Makefile.am	2009-04-03 22:00:00 UTC (rev 4027)
@@ -88,14 +88,14 @@
 	@JEMALLOC_LDADD@ \
 	${DL_LIBS} ${PTHREAD_LIBS} ${NET_LIBS} ${LIBM} ${LIBUMEM}
 
-EXTRA_DIST = default.vcl
+dist_varnishconf_DATA = default.vcl
 DISTCLEANFILES = default_vcl.h
 
 #
 # Turn the default.vcl file into a C-string we can include in the program.
 #
 default_vcl.h:	default.vcl Makefile
-	sed -e 's/"/\\"/g' -e 's/$$/\\n"/' -e 's/^/ "/' $(srcdir)/default.vcl > $@
+	sed -e 's/"/\\"/g; s/$$/\\n"/; s/^/ "/' $(srcdir)/default.vcl > $@
 
 # Explicitly record dependency
-mgt_vcc.c:	default_vcl.h
+mgt_vcc.c: default_vcl.h

Modified: trunk/varnish-cache/bin/varnishd/cache_http.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_http.c	2009-04-03 21:54:25 UTC (rev 4026)
+++ trunk/varnish-cache/bin/varnishd/cache_http.c	2009-04-03 22:00:00 UTC (rev 4027)
@@ -39,7 +39,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <strings.h>
 
 #include "shmlog.h"
 #include "vct.h"

Modified: trunk/varnish-cache/lib/libjemalloc/jemalloc_linux.c
===================================================================
--- trunk/varnish-cache/lib/libjemalloc/jemalloc_linux.c	2009-04-03 21:54:25 UTC (rev 4026)
+++ trunk/varnish-cache/lib/libjemalloc/jemalloc_linux.c	2009-04-03 22:00:00 UTC (rev 4027)
@@ -193,7 +193,6 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
-#include <strings.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <pthread.h>

Modified: trunk/varnish-cache/lib/libjemalloc/malloc.c
===================================================================
--- trunk/varnish-cache/lib/libjemalloc/malloc.c	2009-04-03 21:54:25 UTC (rev 4026)
+++ trunk/varnish-cache/lib/libjemalloc/malloc.c	2009-04-03 22:00:00 UTC (rev 4027)
@@ -186,7 +186,6 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
-#include <strings.h>
 #include <unistd.h>
 
 #include "un-namespace.h"