[master] 1f8a74a Rename zlib.h to vgz.h, take 2

[Poul-Henning Kamp]

commit 1f8a74ac389d8b59c362e95ad1a64af7e1829498
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Jan 24 09:12:45 2011 +0000

    Rename zlib.h to vgz.h, take 2

diff --git a/bin/varnishd/cache_esi_deliver.c b/bin/varnishd/cache_esi_deliver.c
index d5e7c90..6695dee 100644
--- a/bin/varnishd/cache_esi_deliver.c
+++ b/bin/varnishd/cache_esi_deliver.c
@@ -40,7 +40,7 @@ SVNID("$Id")
 #include "cache_esi.h"
 #include "vend.h"
 #include "vct.h"
-#include "zlib.h"
+#include "vgz.h"
 #include "stevedore.h"
 
 /*--------------------------------------------------------------------*/
diff --git a/bin/varnishd/cache_esi_fetch.c b/bin/varnishd/cache_esi_fetch.c
index 0bf2f7c..909d77b 100644
--- a/bin/varnishd/cache_esi_fetch.c
+++ b/bin/varnishd/cache_esi_fetch.c
@@ -39,7 +39,7 @@ SVNID("$Id")
 #include "cache.h"
 #include "cache_esi.h"
 #include "vct.h"
-#include "zlib.h"
+#include "vgz.h"
 #include "stevedore.h"
 
 /*---------------------------------------------------------------------
diff --git a/bin/varnishd/cache_esi_parse.c b/bin/varnishd/cache_esi_parse.c
index 6baeb13..6cc48fa 100644
--- a/bin/varnishd/cache_esi_parse.c
+++ b/bin/varnishd/cache_esi_parse.c
@@ -40,7 +40,7 @@ SVNID("$Id")
 #include "cache_esi.h"
 #include "vend.h"
 #include "vct.h"
-#include "zlib.h"
+#include "vgz.h"
 #include "stevedore.h"
 
 //#define Debug(fmt, ...) printf(fmt, __VA_ARGS__)
diff --git a/bin/varnishd/cache_gzip.c b/bin/varnishd/cache_gzip.c
index a4ea296..9d83462 100644
--- a/bin/varnishd/cache_gzip.c
+++ b/bin/varnishd/cache_gzip.c
@@ -27,9 +27,9 @@
  *
  * Interaction with the linvgz (zlib) library.
  *
- * The libz library pollutes namespace a LOT when you include the "zlib.h"
- * file so we contain the damage by vectoring all access to libz through
- * this source file.
+ * The zlib library pollutes namespace a LOT when you include the "vgz.h"
+ * (aka (zlib.h") file so we contain the damage by vectoring all access
+ * to libz through this source file.
  *
  * The API defined by this file, will also insulate the rest of the code,
  * should we find a better gzip library at a later date.
@@ -74,7 +74,7 @@ SVNID("$Id$")
 #include "cache.h"
 #include "stevedore.h"
 
-#include "zlib.h"
+#include "vgz.h"
 
 struct vgz {
 	unsigned		magic;
diff --git a/bin/varnishtest/vtc_http.c b/bin/varnishtest/vtc_http.c
index f8aa59b..52eb287 100644
--- a/bin/varnishtest/vtc_http.c
+++ b/bin/varnishtest/vtc_http.c
@@ -49,7 +49,7 @@ SVNID("$Id$")
 
 #include "vtc.h"
 
-#include "zlib.h"
+#include "vgz.h"
 
 #define MAX_HDR		50
 
diff --git a/lib/libvgz/Makefile.am b/lib/libvgz/Makefile.am
index bb6010d..446dc64 100644
--- a/lib/libvgz/Makefile.am
+++ b/lib/libvgz/Makefile.am
@@ -28,6 +28,6 @@ libvgz_la_SOURCES = \
 	trees.h \
 	uncompr.c \
 	zconf.h \
-	zlib.h \
+	vgz.h \
 	zutil.c \
 	zutil.h
diff --git a/lib/libvgz/compress.c b/lib/libvgz/compress.c
index fce2020..b369014 100644
--- a/lib/libvgz/compress.c
+++ b/lib/libvgz/compress.c
@@ -6,7 +6,7 @@
 /* @(#) $Id$ */
 
 #define ZLIB_INTERNAL
-#include "zlib.h"
+#include "vgz.h"
 
 /* ===========================================================================
      Compresses the source buffer into the destination buffer. The level
diff --git a/lib/libvgz/gzguts.h b/lib/libvgz/gzguts.h
index 0f8fb79..2f4bfec 100644
--- a/lib/libvgz/gzguts.h
+++ b/lib/libvgz/gzguts.h
@@ -19,7 +19,7 @@
 #endif
 
 #include <stdio.h>
-#include "zlib.h"
+#include "vgz.h"
 #ifdef STDC
 #  include <string.h>
 #  include <stdlib.h>
diff --git a/lib/libvgz/uncompr.c b/lib/libvgz/uncompr.c
index b8c7dcf..78324b1 100644
--- a/lib/libvgz/uncompr.c
+++ b/lib/libvgz/uncompr.c
@@ -6,7 +6,7 @@
 /* @(#) $Id$ */
 
 #define ZLIB_INTERNAL
-#include "zlib.h"
+#include "vgz.h"
 
 /* ===========================================================================
      Decompresses the source buffer into the destination buffer.  sourceLen is
diff --git a/lib/libvgz/zutil.h b/lib/libvgz/zutil.h
index c2727dc..0c7456e 100644
--- a/lib/libvgz/zutil.h
+++ b/lib/libvgz/zutil.h
@@ -19,7 +19,7 @@
 #  define ZLIB_INTERNAL
 #endif
 
-#include "zlib.h"
+#include "vgz.h"
 
 #ifdef STDC
 #  if !(defined(_WIN32_WCE) && defined(_MSC_VER))