[master] eb18d9b Move VSC_C_main to cache namespace only

[Poul-Henning Kamp]

commit eb18d9be13c042ee95b4c102641edb7693003c9f
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Sun Nov 20 19:42:14 2011 +0000

    Move VSC_C_main to cache namespace only

diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index 432e22b..e08cc32 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -850,6 +850,7 @@ int SES_Schedule(struct sess *sp);
 
 
 /* cache_shmlog.c */
+extern struct VSC_C_main *VSC_C_main;
 void VSL_Init(void);
 void *VSM_Alloc(unsigned size, const char *class, const char *type,
     const char *ident);
diff --git a/bin/varnishd/cache/cache_shmlog.c b/bin/varnishd/cache/cache_shmlog.c
index 950f57f..01f6bce 100644
--- a/bin/varnishd/cache/cache_shmlog.c
+++ b/bin/varnishd/cache/cache_shmlog.c
@@ -47,6 +47,8 @@ static uint32_t			*vsl_start;
 static const uint32_t		*vsl_end;
 static uint32_t			*vsl_ptr;
 
+struct VSC_C_main       *VSC_C_main;
+
 static inline uint32_t
 vsl_w0(uint32_t type, uint32_t length)
 {
diff --git a/bin/varnishd/common/common.h b/bin/varnishd/common/common.h
index a5d7633..157e5f7 100644
--- a/bin/varnishd/common/common.h
+++ b/bin/varnishd/common/common.h
@@ -49,7 +49,6 @@ extern pid_t mgt_pid;
 #define ASSERT_MGT() do { assert(getpid() == mgt_pid);} while (0)
 
 /* mgt_shmem.c */
-extern struct VSC_C_main *VSC_C_main;
 #define PAN_CLASS "Panic"
 extern char *PAN_panicstr;
 extern unsigned PAN_panicstr_len;
diff --git a/bin/varnishd/mgt/mgt_shmem.c b/bin/varnishd/mgt/mgt_shmem.c
index 40f0c24..5915b19 100644
--- a/bin/varnishd/mgt/mgt_shmem.c
+++ b/bin/varnishd/mgt/mgt_shmem.c
@@ -57,8 +57,6 @@
 #define MAP_NOSYNC 0 /* XXX Linux */
 #endif
 
-struct VSC_C_main	*VSC_C_main;
-
 static int vsm_fd = -1;
 
 /*--------------------------------------------------------------------