Skip to content

Commit e51f878

Browse files
daxtensDead2
authored andcommitted
Kill z_ prefix support
1 parent e923fd3 commit e51f878

File tree

2 files changed

+1
-155
lines changed

2 files changed

+1
-155
lines changed

configure

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ shared_ext='.so'
9292
shared=1
9393
solo=0
9494
cover=0
95-
zprefix=0
9695
zconst=0
9796
build64=0
9897
without_optimizations=0
@@ -122,7 +121,7 @@ do
122121
case "$1" in
123122
-h* | --help)
124123
echo 'usage:' | tee -a configure.log
125-
echo ' configure [--const] [--zprefix] [--prefix=PREFIX] [--eprefix=EXPREFIX]' | tee -a configure.log
124+
echo ' configure [--const] [--prefix=PREFIX] [--eprefix=EXPREFIX]' | tee -a configure.log
126125
echo ' [--static] [--64] [--libdir=LIBDIR] [--sharedlibdir=LIBDIR]' | tee -a configure.log
127126
echo ' [--includedir=INCLUDEDIR] [--archs="-arch i386 -arch x86_64"]' | tee -a configure.log
128127
exit 0 ;;
@@ -140,7 +139,6 @@ case "$1" in
140139
-t | --static) shared=0; shift ;;
141140
--solo) solo=1; shift ;;
142141
--cover) cover=1; shift ;;
143-
-z* | --zprefix) zprefix=1; shift ;;
144142
-6* | --64) build64=1; shift ;;
145143
-a*=* | --archs=*) ARCHS=`echo $1 | sed 's/.*=//'`; shift ;;
146144
--sysconfdir=*) echo "ignored option: --sysconfdir" | tee -a configure.log; shift ;;
@@ -457,14 +455,6 @@ else
457455
echo "Checking for stdarg.h... No." | tee -a configure.log
458456
fi
459457

460-
# if the z_ prefix was requested, save that in zconf.h
461-
if test $zprefix -eq 1; then
462-
sed < zconf.h "/#ifdef Z_PREFIX.* may be/s/def Z_PREFIX\(.*\) may be/ 1\1 was/" > zconf.temp.h
463-
mv zconf.temp.h zconf.h
464-
echo >> configure.log
465-
echo "Using z_ prefix on all symbols." | tee -a configure.log
466-
fi
467-
468458
# if --solo compilation was requested, save that in zconf.h and remove gz stuff from object lists
469459
if test $solo -eq 1; then
470460
sed '/#define ZCONF_H/a\

zconf.h.in

Lines changed: 0 additions & 144 deletions
Original file line numberDiff line numberDiff line change
@@ -8,150 +8,6 @@
88
#ifndef ZCONF_H
99
#define ZCONF_H
1010

11-
/*
12-
* If you *really* need a unique prefix for all types and library functions,
13-
* compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
14-
* Even better than compiling with -DZ_PREFIX would be to use configure to set
15-
* this permanently in zconf.h using "./configure --zprefix".
16-
*/
17-
#ifdef Z_PREFIX /* may be set to #if 1 by ./configure */
18-
# define Z_PREFIX_SET
19-
20-
/* all linked symbols */
21-
# define _dist_code z__dist_code
22-
# define _length_code z__length_code
23-
# define _tr_align z__tr_align
24-
# define _tr_flush_bits z__tr_flush_bits
25-
# define _tr_flush_block z__tr_flush_block
26-
# define _tr_init z__tr_init
27-
# define _tr_stored_block z__tr_stored_block
28-
# define _tr_tally z__tr_tally
29-
# define adler32 z_adler32
30-
# define adler32_combine z_adler32_combine
31-
# define adler32_combine64 z_adler32_combine64
32-
# ifndef Z_SOLO
33-
# define compress z_compress
34-
# define compress2 z_compress2
35-
# define compressBound z_compressBound
36-
# endif
37-
# define crc32 z_crc32
38-
# define crc32_combine z_crc32_combine
39-
# define crc32_combine64 z_crc32_combine64
40-
# define deflate z_deflate
41-
# define deflateBound z_deflateBound
42-
# define deflateCopy z_deflateCopy
43-
# define deflateEnd z_deflateEnd
44-
# define deflateInit2_ z_deflateInit2_
45-
# define deflateInit_ z_deflateInit_
46-
# define deflateParams z_deflateParams
47-
# define deflatePending z_deflatePending
48-
# define deflatePrime z_deflatePrime
49-
# define deflateReset z_deflateReset
50-
# define deflateResetKeep z_deflateResetKeep
51-
# define deflateSetDictionary z_deflateSetDictionary
52-
# define deflateSetHeader z_deflateSetHeader
53-
# define deflateTune z_deflateTune
54-
# define deflate_copyright z_deflate_copyright
55-
# define get_crc_table z_get_crc_table
56-
# ifndef Z_SOLO
57-
# define gz_error z_gz_error
58-
# define gz_intmax z_gz_intmax
59-
# define gz_strwinerror z_gz_strwinerror
60-
# define gzbuffer z_gzbuffer
61-
# define gzclearerr z_gzclearerr
62-
# define gzclose z_gzclose
63-
# define gzclose_r z_gzclose_r
64-
# define gzclose_w z_gzclose_w
65-
# define gzdirect z_gzdirect
66-
# define gzdopen z_gzdopen
67-
# define gzeof z_gzeof
68-
# define gzerror z_gzerror
69-
# define gzflush z_gzflush
70-
# define gzgetc z_gzgetc
71-
# define gzgetc_ z_gzgetc_
72-
# define gzgets z_gzgets
73-
# define gzoffset z_gzoffset
74-
# define gzoffset64 z_gzoffset64
75-
# define gzopen z_gzopen
76-
# define gzopen64 z_gzopen64
77-
# ifdef _WIN32
78-
# define gzopen_w z_gzopen_w
79-
# endif
80-
# define gzprintf z_gzprintf
81-
# define gzvprintf z_gzvprintf
82-
# define gzputc z_gzputc
83-
# define gzputs z_gzputs
84-
# define gzread z_gzread
85-
# define gzrewind z_gzrewind
86-
# define gzseek z_gzseek
87-
# define gzseek64 z_gzseek64
88-
# define gzsetparams z_gzsetparams
89-
# define gztell z_gztell
90-
# define gztell64 z_gztell64
91-
# define gzungetc z_gzungetc
92-
# define gzwrite z_gzwrite
93-
# endif
94-
# define inflate z_inflate
95-
# define inflateBack z_inflateBack
96-
# define inflateBackEnd z_inflateBackEnd
97-
# define inflateBackInit_ z_inflateBackInit_
98-
# define inflateCopy z_inflateCopy
99-
# define inflateEnd z_inflateEnd
100-
# define inflateGetHeader z_inflateGetHeader
101-
# define inflateInit2_ z_inflateInit2_
102-
# define inflateInit_ z_inflateInit_
103-
# define inflateMark z_inflateMark
104-
# define inflatePrime z_inflatePrime
105-
# define inflateReset z_inflateReset
106-
# define inflateReset2 z_inflateReset2
107-
# define inflateSetDictionary z_inflateSetDictionary
108-
# define inflateGetDictionary z_inflateGetDictionary
109-
# define inflateSync z_inflateSync
110-
# define inflateSyncPoint z_inflateSyncPoint
111-
# define inflateUndermine z_inflateUndermine
112-
# define inflateResetKeep z_inflateResetKeep
113-
# define inflate_copyright z_inflate_copyright
114-
# define inflate_fast z_inflate_fast
115-
# define inflate_table z_inflate_table
116-
# ifndef Z_SOLO
117-
# define uncompress z_uncompress
118-
# endif
119-
# define zError z_zError
120-
# ifndef Z_SOLO
121-
# define zcalloc z_zcalloc
122-
# define zcfree z_zcfree
123-
# endif
124-
# define zlibCompileFlags z_zlibCompileFlags
125-
# define zlibVersion z_zlibVersion
126-
127-
/* all zlib typedefs in zlib.h and zconf.h */
128-
# define Byte z_Byte
129-
# define Bytef z_Bytef
130-
# define alloc_func z_alloc_func
131-
# define charf z_charf
132-
# define free_func z_free_func
133-
# ifndef Z_SOLO
134-
# define gzFile z_gzFile
135-
# endif
136-
# define gz_header z_gz_header
137-
# define gz_headerp z_gz_headerp
138-
# define in_func z_in_func
139-
# define intf z_intf
140-
# define out_func z_out_func
141-
# define uInt z_uInt
142-
# define uIntf z_uIntf
143-
# define uLong z_uLong
144-
# define uLongf z_uLongf
145-
# define voidp z_voidp
146-
# define voidpc z_voidpc
147-
# define voidpf z_voidpf
148-
149-
/* all zlib structs in zlib.h and zconf.h */
150-
# define gz_header_s z_gz_header_s
151-
# define internal_state z_internal_state
152-
153-
#endif
154-
15511
#if defined(_WINDOWS) && !defined(WINDOWS)
15612
# define WINDOWS
15713
#endif

0 commit comments

Comments
 (0)