r3713 - branches/2.0/varnish-cache/bin/varnishd

[tfheen at projects.linpro.no]

Author: tfheen
Date: 2009-02-09 14:25:00 +0100 (Mon, 09 Feb 2009)
New Revision: 3713

Modified:
   branches/2.0/varnish-cache/bin/varnishd/cache.h
   branches/2.0/varnish-cache/bin/varnishd/cache_acceptor.h
Log:
Merge r3525: Move the vca_pipes to a more proper header file



Modified: branches/2.0/varnish-cache/bin/varnishd/cache.h
===================================================================
--- branches/2.0/varnish-cache/bin/varnishd/cache.h	2009-02-09 13:22:00 UTC (rev 3712)
+++ branches/2.0/varnish-cache/bin/varnishd/cache.h	2009-02-09 13:25:00 UTC (rev 3713)
@@ -398,7 +398,6 @@
 void vca_close_session(struct sess *sp, const char *why);
 void VCA_Prep(struct sess *sp);
 void VCA_Init(void);
-extern int vca_pipes[2];
 
 /* cache_backend.c */
 

Modified: branches/2.0/varnish-cache/bin/varnishd/cache_acceptor.h
===================================================================
--- branches/2.0/varnish-cache/bin/varnishd/cache_acceptor.h	2009-02-09 13:22:00 UTC (rev 3712)
+++ branches/2.0/varnish-cache/bin/varnishd/cache_acceptor.h	2009-02-09 13:25:00 UTC (rev 3713)
@@ -34,6 +34,8 @@
 typedef void acceptor_init_f(void);
 typedef void acceptor_pass_f(struct sess *);
 
+extern int vca_pipes[2];
+
 struct acceptor {
 	const char		*name;
 	acceptor_init_f		*init;