Skip to content

V
varnishevent3
Commit 3fdd22c8 authored by Poul-Henning Kamp's avatar Poul-Henning Kamp
Browse files
Options

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.



git-svn-id: http://www.varnish-cache.org/svn/trunk/varnish-cache@5682 d4fa192b-c00b-0410-8231-f00ffab90ce4
parent adbdbdbb
Hide whitespace changes
Inline Side-by-side
Showing with 108 additions and 108 deletions
lib/libvgz/zconf.h
View file @ 3fdd22c8
...@@ -16,120 +16,120 @@ ...@@ -16,120 +16,120 @@
* Even better than compiling with -DZ_PREFIX would be to use configure to set * Even better than compiling with -DZ_PREFIX would be to use configure to set
* this permanently in zconf.h using "./configure --zprefix". * this permanently in zconf.h using "./configure --zprefix".
*/ */
#if 1 #ifdef Z_PREFIX /* may be set to #if 1 by ./configure */
/* all linked symbols */ /* all linked symbols */
# define _dist_code vgz__dist_code # define _dist_code z__dist_code
# define _length_code vgz__length_code # define _length_code z__length_code
# define _tr_align vgz__tr_align # define _tr_align z__tr_align
# define _tr_flush_block vgz__tr_flush_block # define _tr_flush_block z__tr_flush_block
# define _tr_init vgz__tr_init # define _tr_init z__tr_init
# define _tr_stored_block vgz__tr_stored_block # define _tr_stored_block z__tr_stored_block
# define _tr_tally vgz__tr_tally # define _tr_tally z__tr_tally
# define adler32 vgz_adler32 # define adler32 z_adler32
# define adler32_combine vgz_adler32_combine # define adler32_combine z_adler32_combine
# define adler32_combine64 vgz_adler32_combine64 # define adler32_combine64 z_adler32_combine64
# define compress vgz_compress # define compress z_compress
# define compress2 vgz_compress2 # define compress2 z_compress2
# define compressBound vgz_compressBound # define compressBound z_compressBound
# define crc32 vgz_crc32 # define crc32 z_crc32
# define crc32_combine vgz_crc32_combine # define crc32_combine z_crc32_combine
# define crc32_combine64 vgz_crc32_combine64 # define crc32_combine64 z_crc32_combine64
# define deflate vgz_deflate # define deflate z_deflate
# define deflateBound vgz_deflateBound # define deflateBound z_deflateBound
# define deflateCopy vgz_deflateCopy # define deflateCopy z_deflateCopy
# define deflateEnd vgz_deflateEnd # define deflateEnd z_deflateEnd
# define deflateInit2_ vgz_deflateInit2_ # define deflateInit2_ z_deflateInit2_
# define deflateInit_ vgz_deflateInit_ # define deflateInit_ z_deflateInit_
# define deflateParams vgz_deflateParams # define deflateParams z_deflateParams
# define deflatePrime vgz_deflatePrime # define deflatePrime z_deflatePrime
# define deflateReset vgz_deflateReset # define deflateReset z_deflateReset
# define deflateSetDictionary vgz_deflateSetDictionary # define deflateSetDictionary z_deflateSetDictionary
# define deflateSetHeader vgz_deflateSetHeader # define deflateSetHeader z_deflateSetHeader
# define deflateTune vgz_deflateTune # define deflateTune z_deflateTune
# define deflate_copyright vgz_deflate_copyright # define deflate_copyright z_deflate_copyright
# define get_crc_table vgz_get_crc_table # define get_crc_table z_get_crc_table
# define gz_error vgz_gz_error # define gz_error z_gz_error
# define gz_intmax vgz_gz_intmax # define gz_intmax z_gz_intmax
# define gz_strwinerror vgz_gz_strwinerror # define gz_strwinerror z_gz_strwinerror
# define gzbuffer vgz_gzbuffer # define gzbuffer z_gzbuffer
# define gzclearerr vgz_gzclearerr # define gzclearerr z_gzclearerr
# define gzclose vgz_gzclose # define gzclose z_gzclose
# define gzclose_r vgz_gzclose_r # define gzclose_r z_gzclose_r
# define gzclose_w vgz_gzclose_w # define gzclose_w z_gzclose_w
# define gzdirect vgz_gzdirect # define gzdirect z_gzdirect
# define gzdopen vgz_gzdopen # define gzdopen z_gzdopen
# define gzeof vgz_gzeof # define gzeof z_gzeof
# define gzerror vgz_gzerror # define gzerror z_gzerror
# define gzflush vgz_gzflush # define gzflush z_gzflush
# define gzgetc vgz_gzgetc # define gzgetc z_gzgetc
# define gzgets vgz_gzgets # define gzgets z_gzgets
# define gzoffset vgz_gzoffset # define gzoffset z_gzoffset
# define gzoffset64 vgz_gzoffset64 # define gzoffset64 z_gzoffset64
# define gzopen vgz_gzopen # define gzopen z_gzopen
# define gzopen64 vgz_gzopen64 # define gzopen64 z_gzopen64
# define gzprintf vgz_gzprintf # define gzprintf z_gzprintf
# define gzputc vgz_gzputc # define gzputc z_gzputc
# define gzputs vgz_gzputs # define gzputs z_gzputs
# define gzread vgz_gzread # define gzread z_gzread
# define gzrewind vgz_gzrewind # define gzrewind z_gzrewind
# define gzseek vgz_gzseek # define gzseek z_gzseek
# define gzseek64 vgz_gzseek64 # define gzseek64 z_gzseek64
# define gzsetparams vgz_gzsetparams # define gzsetparams z_gzsetparams
# define gztell vgz_gztell # define gztell z_gztell
# define gztell64 vgz_gztell64 # define gztell64 z_gztell64
# define gzungetc vgz_gzungetc # define gzungetc z_gzungetc
# define gzwrite vgz_gzwrite # define gzwrite z_gzwrite
# define inflate vgz_inflate # define inflate z_inflate
# define inflateBack vgz_inflateBack # define inflateBack z_inflateBack
# define inflateBackEnd vgz_inflateBackEnd # define inflateBackEnd z_inflateBackEnd
# define inflateBackInit_ vgz_inflateBackInit_ # define inflateBackInit_ z_inflateBackInit_
# define inflateCopy vgz_inflateCopy # define inflateCopy z_inflateCopy
# define inflateEnd vgz_inflateEnd # define inflateEnd z_inflateEnd
# define inflateGetHeader vgz_inflateGetHeader # define inflateGetHeader z_inflateGetHeader
# define inflateInit2_ vgz_inflateInit2_ # define inflateInit2_ z_inflateInit2_
# define inflateInit_ vgz_inflateInit_ # define inflateInit_ z_inflateInit_
# define inflateMark vgz_inflateMark # define inflateMark z_inflateMark
# define inflatePrime vgz_inflatePrime # define inflatePrime z_inflatePrime
# define inflateReset vgz_inflateReset # define inflateReset z_inflateReset
# define inflateReset2 vgz_inflateReset2 # define inflateReset2 z_inflateReset2
# define inflateSetDictionary vgz_inflateSetDictionary # define inflateSetDictionary z_inflateSetDictionary
# define inflateSync vgz_inflateSync # define inflateSync z_inflateSync
# define inflateSyncPoint vgz_inflateSyncPoint # define inflateSyncPoint z_inflateSyncPoint
# define inflateUndermine vgz_inflateUndermine # define inflateUndermine z_inflateUndermine
# define inflate_copyright vgz_inflate_copyright # define inflate_copyright z_inflate_copyright
# define inflate_fast vgz_inflate_fast # define inflate_fast z_inflate_fast
# define inflate_table vgz_inflate_table # define inflate_table z_inflate_table
# define uncompress vgz_uncompress # define uncompress z_uncompress
# define zError vgz_zError # define zError z_zError
# define zcalloc vgz_zcalloc # define zcalloc z_zcalloc
# define zcfree vgz_zcfree # define zcfree z_zcfree
# define zlibCompileFlags vgz_zlibCompileFlags # define zlibCompileFlags z_zlibCompileFlags
# define zlibVersion vgz_zlibVersion # define zlibVersion z_zlibVersion
/* all zlib typedefs in zlib.h and zconf.h */ /* all zlib typedefs in zlib.h and zconf.h */
# define Byte vgz_Byte # define Byte z_Byte
# define Bytef vgz_Bytef # define Bytef z_Bytef
# define alloc_func vgz_alloc_func # define alloc_func z_alloc_func
# define charf vgz_charf # define charf z_charf
# define free_func vgz_free_func # define free_func z_free_func
# define gzFile vgz_gzFile # define gzFile z_gzFile
# define gz_header vgz_gz_header # define gz_header z_gz_header
# define gz_headerp vgz_gz_headerp # define gz_headerp z_gz_headerp
# define in_func vgz_in_func # define in_func z_in_func
# define intf vgz_intf # define intf z_intf
# define out_func vgz_out_func # define out_func z_out_func
# define uInt vgz_uInt # define uInt z_uInt
# define uIntf vgz_uIntf # define uIntf z_uIntf
# define uLong vgz_uLong # define uLong z_uLong
# define uLongf vgz_uLongf # define uLongf z_uLongf
# define voidp vgz_voidp # define voidp z_voidp
# define voidpc vgz_voidpc # define voidpc z_voidpc
# define voidpf vgz_voidpf # define voidpf z_voidpf
/* all zlib structs in zlib.h and zconf.h */ /* all zlib structs in zlib.h and zconf.h */
# define gz_header_s vgz_gz_header_s # define gz_header_s z_gz_header_s
# define internal_state vgz_internal_state # define internal_state z_internal_state
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment