r5682 - trunk/varnish-cache/lib/libvgz
phk at varnish-cache.org
phk at varnish-cache.org
Tue Jan 4 15:56:05 CET 2011
Author: phk
Date: 2011-01-04 15:56:04 +0100 (Tue, 04 Jan 2011)
New Revision: 5682
Modified:
trunk/varnish-cache/lib/libvgz/zconf.h
Log:
We cannot use the zconf/PREFIX stuff to hide symbols, the #defines
clash with the version hacks near the end of zlib.h
Will revisit once I know which subset of this library I actually need,
it will probably be possible to remove the entire gz* family functions.
Modified: trunk/varnish-cache/lib/libvgz/zconf.h
===================================================================
--- trunk/varnish-cache/lib/libvgz/zconf.h 2011-01-04 14:44:21 UTC (rev 5681)
+++ trunk/varnish-cache/lib/libvgz/zconf.h 2011-01-04 14:56:04 UTC (rev 5682)
@@ -16,120 +16,120 @@
* Even better than compiling with -DZ_PREFIX would be to use configure to set
* this permanently in zconf.h using "./configure --zprefix".
*/
-#if 1
+#ifdef Z_PREFIX /* may be set to #if 1 by ./configure */
/* all linked symbols */
-# define _dist_code vgz__dist_code
-# define _length_code vgz__length_code
-# define _tr_align vgz__tr_align
-# define _tr_flush_block vgz__tr_flush_block
-# define _tr_init vgz__tr_init
-# define _tr_stored_block vgz__tr_stored_block
-# define _tr_tally vgz__tr_tally
-# define adler32 vgz_adler32
-# define adler32_combine vgz_adler32_combine
-# define adler32_combine64 vgz_adler32_combine64
-# define compress vgz_compress
-# define compress2 vgz_compress2
-# define compressBound vgz_compressBound
-# define crc32 vgz_crc32
-# define crc32_combine vgz_crc32_combine
-# define crc32_combine64 vgz_crc32_combine64
-# define deflate vgz_deflate
-# define deflateBound vgz_deflateBound
-# define deflateCopy vgz_deflateCopy
-# define deflateEnd vgz_deflateEnd
-# define deflateInit2_ vgz_deflateInit2_
-# define deflateInit_ vgz_deflateInit_
-# define deflateParams vgz_deflateParams
-# define deflatePrime vgz_deflatePrime
-# define deflateReset vgz_deflateReset
-# define deflateSetDictionary vgz_deflateSetDictionary
-# define deflateSetHeader vgz_deflateSetHeader
-# define deflateTune vgz_deflateTune
-# define deflate_copyright vgz_deflate_copyright
-# define get_crc_table vgz_get_crc_table
-# define gz_error vgz_gz_error
-# define gz_intmax vgz_gz_intmax
-# define gz_strwinerror vgz_gz_strwinerror
-# define gzbuffer vgz_gzbuffer
-# define gzclearerr vgz_gzclearerr
-# define gzclose vgz_gzclose
-# define gzclose_r vgz_gzclose_r
-# define gzclose_w vgz_gzclose_w
-# define gzdirect vgz_gzdirect
-# define gzdopen vgz_gzdopen
-# define gzeof vgz_gzeof
-# define gzerror vgz_gzerror
-# define gzflush vgz_gzflush
-# define gzgetc vgz_gzgetc
-# define gzgets vgz_gzgets
-# define gzoffset vgz_gzoffset
-# define gzoffset64 vgz_gzoffset64
-# define gzopen vgz_gzopen
-# define gzopen64 vgz_gzopen64
-# define gzprintf vgz_gzprintf
-# define gzputc vgz_gzputc
-# define gzputs vgz_gzputs
-# define gzread vgz_gzread
-# define gzrewind vgz_gzrewind
-# define gzseek vgz_gzseek
-# define gzseek64 vgz_gzseek64
-# define gzsetparams vgz_gzsetparams
-# define gztell vgz_gztell
-# define gztell64 vgz_gztell64
-# define gzungetc vgz_gzungetc
-# define gzwrite vgz_gzwrite
-# define inflate vgz_inflate
-# define inflateBack vgz_inflateBack
-# define inflateBackEnd vgz_inflateBackEnd
-# define inflateBackInit_ vgz_inflateBackInit_
-# define inflateCopy vgz_inflateCopy
-# define inflateEnd vgz_inflateEnd
-# define inflateGetHeader vgz_inflateGetHeader
-# define inflateInit2_ vgz_inflateInit2_
-# define inflateInit_ vgz_inflateInit_
-# define inflateMark vgz_inflateMark
-# define inflatePrime vgz_inflatePrime
-# define inflateReset vgz_inflateReset
-# define inflateReset2 vgz_inflateReset2
-# define inflateSetDictionary vgz_inflateSetDictionary
-# define inflateSync vgz_inflateSync
-# define inflateSyncPoint vgz_inflateSyncPoint
-# define inflateUndermine vgz_inflateUndermine
-# define inflate_copyright vgz_inflate_copyright
-# define inflate_fast vgz_inflate_fast
-# define inflate_table vgz_inflate_table
-# define uncompress vgz_uncompress
-# define zError vgz_zError
-# define zcalloc vgz_zcalloc
-# define zcfree vgz_zcfree
-# define zlibCompileFlags vgz_zlibCompileFlags
-# define zlibVersion vgz_zlibVersion
+# define _dist_code z__dist_code
+# define _length_code z__length_code
+# define _tr_align z__tr_align
+# define _tr_flush_block z__tr_flush_block
+# define _tr_init z__tr_init
+# define _tr_stored_block z__tr_stored_block
+# define _tr_tally z__tr_tally
+# define adler32 z_adler32
+# define adler32_combine z_adler32_combine
+# define adler32_combine64 z_adler32_combine64
+# define compress z_compress
+# define compress2 z_compress2
+# define compressBound z_compressBound
+# define crc32 z_crc32
+# define crc32_combine z_crc32_combine
+# define crc32_combine64 z_crc32_combine64
+# define deflate z_deflate
+# define deflateBound z_deflateBound
+# define deflateCopy z_deflateCopy
+# define deflateEnd z_deflateEnd
+# define deflateInit2_ z_deflateInit2_
+# define deflateInit_ z_deflateInit_
+# define deflateParams z_deflateParams
+# define deflatePrime z_deflatePrime
+# define deflateReset z_deflateReset
+# define deflateSetDictionary z_deflateSetDictionary
+# define deflateSetHeader z_deflateSetHeader
+# define deflateTune z_deflateTune
+# define deflate_copyright z_deflate_copyright
+# define get_crc_table z_get_crc_table
+# define gz_error z_gz_error
+# define gz_intmax z_gz_intmax
+# define gz_strwinerror z_gz_strwinerror
+# define gzbuffer z_gzbuffer
+# define gzclearerr z_gzclearerr
+# define gzclose z_gzclose
+# define gzclose_r z_gzclose_r
+# define gzclose_w z_gzclose_w
+# define gzdirect z_gzdirect
+# define gzdopen z_gzdopen
+# define gzeof z_gzeof
+# define gzerror z_gzerror
+# define gzflush z_gzflush
+# define gzgetc z_gzgetc
+# define gzgets z_gzgets
+# define gzoffset z_gzoffset
+# define gzoffset64 z_gzoffset64
+# define gzopen z_gzopen
+# define gzopen64 z_gzopen64
+# define gzprintf z_gzprintf
+# define gzputc z_gzputc
+# define gzputs z_gzputs
+# define gzread z_gzread
+# define gzrewind z_gzrewind
+# define gzseek z_gzseek
+# define gzseek64 z_gzseek64
+# define gzsetparams z_gzsetparams
+# define gztell z_gztell
+# define gztell64 z_gztell64
+# define gzungetc z_gzungetc
+# define gzwrite z_gzwrite
+# define inflate z_inflate
+# define inflateBack z_inflateBack
+# define inflateBackEnd z_inflateBackEnd
+# define inflateBackInit_ z_inflateBackInit_
+# define inflateCopy z_inflateCopy
+# define inflateEnd z_inflateEnd
+# define inflateGetHeader z_inflateGetHeader
+# define inflateInit2_ z_inflateInit2_
+# define inflateInit_ z_inflateInit_
+# define inflateMark z_inflateMark
+# define inflatePrime z_inflatePrime
+# define inflateReset z_inflateReset
+# define inflateReset2 z_inflateReset2
+# define inflateSetDictionary z_inflateSetDictionary
+# define inflateSync z_inflateSync
+# define inflateSyncPoint z_inflateSyncPoint
+# define inflateUndermine z_inflateUndermine
+# define inflate_copyright z_inflate_copyright
+# define inflate_fast z_inflate_fast
+# define inflate_table z_inflate_table
+# define uncompress z_uncompress
+# define zError z_zError
+# define zcalloc z_zcalloc
+# define zcfree z_zcfree
+# define zlibCompileFlags z_zlibCompileFlags
+# define zlibVersion z_zlibVersion
/* all zlib typedefs in zlib.h and zconf.h */
-# define Byte vgz_Byte
-# define Bytef vgz_Bytef
-# define alloc_func vgz_alloc_func
-# define charf vgz_charf
-# define free_func vgz_free_func
-# define gzFile vgz_gzFile
-# define gz_header vgz_gz_header
-# define gz_headerp vgz_gz_headerp
-# define in_func vgz_in_func
-# define intf vgz_intf
-# define out_func vgz_out_func
-# define uInt vgz_uInt
-# define uIntf vgz_uIntf
-# define uLong vgz_uLong
-# define uLongf vgz_uLongf
-# define voidp vgz_voidp
-# define voidpc vgz_voidpc
-# define voidpf vgz_voidpf
+# define Byte z_Byte
+# define Bytef z_Bytef
+# define alloc_func z_alloc_func
+# define charf z_charf
+# define free_func z_free_func
+# define gzFile z_gzFile
+# define gz_header z_gz_header
+# define gz_headerp z_gz_headerp
+# define in_func z_in_func
+# define intf z_intf
+# define out_func z_out_func
+# define uInt z_uInt
+# define uIntf z_uIntf
+# define uLong z_uLong
+# define uLongf z_uLongf
+# define voidp z_voidp
+# define voidpc z_voidpc
+# define voidpf z_voidpf
/* all zlib structs in zlib.h and zconf.h */
-# define gz_header_s vgz_gz_header_s
-# define internal_state vgz_internal_state
+# define gz_header_s z_gz_header_s
+# define internal_state z_internal_state
#endif
More information about the varnish-commit
mailing list