summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Adler <madler@alumni.caltech.edu>2011-09-09 23:25:38 -0700
committerMark Adler <madler@alumni.caltech.edu>2011-09-09 23:25:38 -0700
commitd6231142d2b883a8c3b253fa34992b5cdb4ac2fe (patch)
tree74e07c6ca624264cec9284e25dfd11bd8f877801
parentb1c19ca6d82c98a8be6cd9cad7a9c5fa5e8e634e (diff)
downloadzlib-1.2.3.2.tar.gz
zlib-1.2.3.2.tar.bz2
zlib-1.2.3.2.zip
zlib 1.2.3.2v1.2.3.2
Diffstat
-rw-r--r--ChangeLog9
-rw-r--r--INDEX6
-rw-r--r--Makefile87
-rw-r--r--Makefile.in87
-rw-r--r--README4
-rw-r--r--as400/zlib.inc6
-rwxr-xr-xconfigure41
-rw-r--r--contrib/infback9/inftree9.c6
-rw-r--r--contrib/minizip/unzip.c2
-rw-r--r--contrib/vstudio/vc7/zlib.rc8
-rw-r--r--deflate.c4
-rw-r--r--inftrees.c6
-rw-r--r--make_vms.com52
-rw-r--r--qnx/package.qpg10
-rw-r--r--todo/Makefile-new201
-rw-r--r--todo/README1
-rw-r--r--treebuild.xml114
-rw-r--r--zconf.h10
-rw-r--r--zconf.in.h396
-rw-r--r--zlib.34
-rw-r--r--zlib.h6
-rw-r--r--zlibdefs.h0
-rw-r--r--zutil.h6
23 files changed, 344 insertions, 722 deletions
diff --git a/ChangeLog b/ChangeLog
index 9c16de1..3fa7ae1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,15 @@
1 1
2 ChangeLog file for zlib 2 ChangeLog file for zlib
3 3
4Changes in 1.2.3.2 (3 September 2006)
5- Turn off silly Borland warnings [Hay]
6- Use off64_t and define _LARGEFILE64_SOURCE when present
7- Fix missing dependency on inffixed.h in Makefile.in
8- Rig configure --shared to build both shared and static [Teredesai, Truta]
9- Remove zconf.in.h and instead create a new zlibdefs.h file
10- Fix contrib/minizip/unzip.c non-encrypted after encrypted [Vollant]
11- Add treebuild.xml (see http://treebuild.metux.de/) [Weigelt]
12
4Changes in 1.2.3.1 (16 August 2006) 13Changes in 1.2.3.1 (16 August 2006)
5- Add watcom directory with OpenWatcom make files [Daniel] 14- Add watcom directory with OpenWatcom make files [Daniel]
6- Remove #undef of FAR in zconf.in.h for MVS [Fedtke] 15- Remove #undef of FAR in zconf.in.h for MVS [Fedtke]
diff --git a/INDEX b/INDEX
index a2e954b..722d4ec 100644
--- a/INDEX
+++ b/INDEX
@@ -6,10 +6,10 @@ Makefile.in makefile for Unix (template for configure)
6README guess what 6README guess what
7configure configure script for Unix 7configure configure script for Unix
8make_vms.com makefile for VMS 8make_vms.com makefile for VMS
9zconf.in.h template for zconf.h (used by configure) 9treebuild.xml see http://treebuild.metux.de/
10zlib.3 Man page for zlib 10zlib.3 Man page for zlib
11zlib.map Linux symbol information 11zlib.map Linux symbol information
12zlib.pc.in ?? 12zlib.pc.in Template for pkg-config descriptor
13 13
14amiga/ makefiles for Amiga SAS C 14amiga/ makefiles for Amiga SAS C
15as400/ makefiles for IBM AS/400 15as400/ makefiles for IBM AS/400
@@ -19,13 +19,13 @@ old/ makefiles for various architectures and zlib documentation
19 files that have not yet been updated for zlib 1.2.x 19 files that have not yet been updated for zlib 1.2.x
20projects/ projects for various Integrated Development Environments 20projects/ projects for various Integrated Development Environments
21qnx/ makefiles for QNX 21qnx/ makefiles for QNX
22todo/ works in progress
23watcom/ makefiles for OpenWatcom 22watcom/ makefiles for OpenWatcom
24win32/ makefiles for Windows 23win32/ makefiles for Windows
25 24
26 zlib public header files (required for library use): 25 zlib public header files (required for library use):
27zconf.h 26zconf.h
28zlib.h 27zlib.h
28zlibdefs.h
29 29
30 private source files used to build the zlib library: 30 private source files used to build the zlib library:
31adler32.c 31adler32.c
diff --git a/Makefile b/Makefile
index 460471b..8c77268 100644
--- a/Makefile
+++ b/Makefile
@@ -24,13 +24,15 @@ CFLAGS=-O
24#CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \ 24#CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
25# -Wstrict-prototypes -Wmissing-prototypes 25# -Wstrict-prototypes -Wmissing-prototypes
26 26
27SFLAGS=-O
28
27LDFLAGS=libz.a 29LDFLAGS=libz.a
28LDSHARED=$(CC) 30LDSHARED=$(CC)
29CPP=$(CC) -E 31CPP=$(CC) -E
30 32
31LIBS=libz.a 33LIBS=libz.a
32SHAREDLIB=libz.so 34SHAREDLIB=libz.so
33SHAREDLIBV=libz.so.1.2.3.1 35SHAREDLIBV=libz.so.1.2.3.2
34SHAREDLIBM=libz.so.1 36SHAREDLIBM=libz.so.1
35 37
36AR=ar 38AR=ar
@@ -47,12 +49,16 @@ mandir = ${prefix}/share/man
47man3dir = ${mandir}/man3 49man3dir = ${mandir}/man3
48pkgconfigdir = ${libdir}/pkgconfig 50pkgconfigdir = ${libdir}/pkgconfig
49 51
50OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \ 52OBJC = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \
51 zutil.o inflate.o infback.o inftrees.o inffast.o 53 zutil.o inflate.o infback.o inftrees.o inffast.o
52 54
53OBJA = 55OBJA =
54# to use the asm code: make OBJA=match.o 56# to use the asm code: make OBJA=match.o
55 57
58OBJS = $(OBJC) $(OBJA)
59
60PIC_OBJS = $(OBJS:%.o=%.lo)
61
56TEST_OBJS = example.o minigzip.o 62TEST_OBJS = example.o minigzip.o
57 63
58all: example$(EXE) minigzip$(EXE) 64all: example$(EXE) minigzip$(EXE)
@@ -68,8 +74,8 @@ test: all
68 echo ' *** zlib test FAILED ***'; \ 74 echo ' *** zlib test FAILED ***'; \
69 fi 75 fi
70 76
71libz.a: $(OBJS) $(OBJA) 77libz.a: $(OBJS)
72 $(AR) $@ $(OBJS) $(OBJA) 78 $(AR) $@ $(OBJS)
73 -@ ($(RANLIB) $@ || true) >/dev/null 2>&1 79 -@ ($(RANLIB) $@ || true) >/dev/null 2>&1
74 80
75match.o: match.S 81match.o: match.S
@@ -78,8 +84,17 @@ match.o: match.S
78 mv _match.o match.o 84 mv _match.o match.o
79 rm -f _match.s 85 rm -f _match.s
80 86
81$(SHAREDLIBV): $(OBJS) 87match.lo: match.S
82 $(LDSHARED) -o $@ $(OBJS) 88 $(CPP) match.S > _match.s
89 $(CC) -c -fPIC _match.s
90 mv _match.o match.lo
91 rm -f _match.s
92
93%.lo: %.c
94 $(CC) $(SFLAGS) -DPIC -c $< -o $@
95
96$(SHAREDLIBV): $(PIC_OBJS)
97 $(LDSHARED) -o $@ $(PIC_OBJS) -lc
83 rm -f $(SHAREDLIB) $(SHAREDLIBM) 98 rm -f $(SHAREDLIB) $(SHAREDLIBM)
84 ln -s $@ $(SHAREDLIB) 99 ln -s $@ $(SHAREDLIB)
85 ln -s $@ $(SHAREDLIBM) 100 ln -s $@ $(SHAREDLIBM)
@@ -90,14 +105,11 @@ example$(EXE): example.o $(LIBS)
90minigzip$(EXE): minigzip.o $(LIBS) 105minigzip$(EXE): minigzip.o $(LIBS)
91 $(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS) 106 $(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS)
92 107
93install: $(LIBS) 108install-libs: $(LIBS)
94 -@if [ ! -d $(DESTDIR)$(exec_prefix) ]; then mkdir -p $(DESTDIR)$(exec_prefix); fi 109 -@if [ ! -d $(DESTDIR)$(exec_prefix) ]; then mkdir -p $(DESTDIR)$(exec_prefix); fi
95 -@if [ ! -d $(DESTDIR)$(includedir) ]; then mkdir -p $(DESTDIR)$(includedir); fi
96 -@if [ ! -d $(DESTDIR)$(libdir) ]; then mkdir -p $(DESTDIR)$(libdir); fi 110 -@if [ ! -d $(DESTDIR)$(libdir) ]; then mkdir -p $(DESTDIR)$(libdir); fi
97 -@if [ ! -d $(DESTDIR)$(man3dir) ]; then mkdir -p $(DESTDIR)$(man3dir); fi 111 -@if [ ! -d $(DESTDIR)$(man3dir) ]; then mkdir -p $(DESTDIR)$(man3dir); fi
98 -@if [ ! -d $(DESTDIR)$(pkgconfigdir) ]; then mkdir -p $(DESTDIR)$(pkgconfigdir); fi 112 -@if [ ! -d $(DESTDIR)$(pkgconfigdir) ]; then mkdir -p $(DESTDIR)$(pkgconfigdir); fi
99 cp zlib.h zconf.h $(DESTDIR)$(includedir)
100 chmod 644 $(DESTDIR)$(includedir)/zlib.h $(DESTDIR)$(includedir)/zconf.h
101 cp $(LIBS) $(DESTDIR)$(libdir) 113 cp $(LIBS) $(DESTDIR)$(libdir)
102 cd $(DESTDIR)$(libdir); chmod 755 $(LIBS) 114 cd $(DESTDIR)$(libdir); chmod 755 $(LIBS)
103 -@(cd $(DESTDIR)$(libdir); $(RANLIB) libz.a || true) >/dev/null 2>&1 115 -@(cd $(DESTDIR)$(libdir); $(RANLIB) libz.a || true) >/dev/null 2>&1
@@ -114,8 +126,13 @@ install: $(LIBS)
114# The ranlib in install is needed on NeXTSTEP which checks file times 126# The ranlib in install is needed on NeXTSTEP which checks file times
115# ldconfig is for Linux 127# ldconfig is for Linux
116 128
129install: install-libs
130 -@if [ ! -d $(DESTDIR)$(includedir) ]; then mkdir -p $(DESTDIR)$(includedir); fi
131 cp zlib.h zconf.h zlibdefs.h $(DESTDIR)$(includedir)
132 chmod 644 $(DESTDIR)$(includedir)/zlib.h $(DESTDIR)$(includedir)/zconf.h $(DESTDIR)$(includedir)/zlibdefs.h
133
117uninstall: 134uninstall:
118 cd $(DESTDIR)$(includedir); rm -f zlib.h zconf.h 135 cd $(DESTDIR)$(includedir); rm -f zlib.h zconf.h zlibdefs.h
119 cd $(DESTDIR)$(libdir); rm -f libz.a; \ 136 cd $(DESTDIR)$(libdir); rm -f libz.a; \
120 if test -f $(SHAREDLIBV); then \ 137 if test -f $(SHAREDLIBV); then \
121 rm -f $(SHAREDLIBV) $(SHAREDLIB) $(SHAREDLIBM); \ 138 rm -f $(SHAREDLIBV) $(SHAREDLIB) $(SHAREDLIBM); \
@@ -125,14 +142,15 @@ uninstall:
125 142
126mostlyclean: clean 143mostlyclean: clean
127clean: 144clean:
128 rm -f *.o *~ example$(EXE) minigzip$(EXE) \ 145 rm -f *.o *.lo *~ example$(EXE) minigzip$(EXE) \
129 libz.* foo.gz so_locations \ 146 libz.* foo.gz so_locations \
130 _match.s maketree contrib/infback9/*.o 147 _match.s maketree contrib/infback9/*.o
131 148
132maintainer-clean: distclean 149maintainer-clean: distclean
133distclean: clean 150distclean: clean
134 cp -p Makefile.in Makefile 151 cp -p Makefile.in Makefile
135 cp -p zconf.in.h zconf.h 152 rm zlibdefs.h
153 touch -r configure zlibdefs.h
136 rm -f zlib.pc .DS_Store 154 rm -f zlib.pc .DS_Store
137 155
138tags: 156tags:
@@ -143,17 +161,32 @@ depend:
143 161
144# DO NOT DELETE THIS LINE -- make depend depends on it. 162# DO NOT DELETE THIS LINE -- make depend depends on it.
145 163
146adler32.o: zlib.h zconf.h 164adler32.o: zlib.h zconf.h zlibdefs.h
147compress.o: zlib.h zconf.h 165compress.o: zlib.h zconf.h zlibdefs.h
148crc32.o: crc32.h zlib.h zconf.h 166crc32.o: crc32.h zlib.h zconf.h zlibdefs.h
149deflate.o: deflate.h zutil.h zlib.h zconf.h 167deflate.o: deflate.h zutil.h zlib.h zconf.h zlibdefs.h
150example.o: zlib.h zconf.h 168example.o: zlib.h zconf.h zlibdefs.h
151gzio.o: zutil.h zlib.h zconf.h 169gzio.o: zutil.h zlib.h zconf.h zlibdefs.h
152inffast.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h 170inffast.o: zutil.h zlib.h zconf.h zlibdefs.h inftrees.h inflate.h inffast.h
153inflate.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h 171inflate.o: zutil.h zlib.h zconf.h zlibdefs.h inftrees.h inflate.h inffast.h inffixed.h
154infback.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h 172infback.o: zutil.h zlib.h zconf.h zlibdefs.h inftrees.h inflate.h inffast.h inffixed.h
155inftrees.o: zutil.h zlib.h zconf.h inftrees.h 173inftrees.o: zutil.h zlib.h zconf.h zlibdefs.h inftrees.h
156minigzip.o: zlib.h zconf.h 174minigzip.o: zlib.h zconf.h zlibdefs.h
157trees.o: deflate.h zutil.h zlib.h zconf.h trees.h 175trees.o: deflate.h zutil.h zlib.h zconf.h zlibdefs.h trees.h
158uncompr.o: zlib.h zconf.h 176uncompr.o: zlib.h zconf.h zlibdefs.h
159zutil.o: zutil.h zlib.h zconf.h 177zutil.o: zutil.h zlib.h zconf.h zlibdefs.h
178
179adler32.lo: zlib.h zconf.h zlibdefs.h
180compress.lo: zlib.h zconf.h zlibdefs.h
181crc32.lo: crc32.h zlib.h zconf.h zlibdefs.h
182deflate.lo: deflate.h zutil.h zlib.h zconf.h zlibdefs.h
183example.lo: zlib.h zconf.h zlibdefs.h
184gzio.lo: zutil.h zlib.h zconf.h zlibdefs.h
185inffast.lo: zutil.h zlib.h zconf.h zlibdefs.h inftrees.h inflate.h inffast.h
186inflate.lo: zutil.h zlib.h zconf.h zlibdefs.h inftrees.h inflate.h inffast.h inffixed.h
187infback.lo: zutil.h zlib.h zconf.h zlibdefs.h inftrees.h inflate.h inffast.h inffixed.h
188inftrees.lo: zutil.h zlib.h zconf.h zlibdefs.h inftrees.h
189minigzip.lo: zlib.h zconf.h zlibdefs.h
190trees.lo: deflate.h zutil.h zlib.h zconf.h zlibdefs.h trees.h
191uncompr.lo: zlib.h zconf.h zlibdefs.h
192zutil.lo: zutil.h zlib.h zconf.h zlibdefs.h
diff --git a/Makefile.in b/Makefile.in
index 460471b..8c77268 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -24,13 +24,15 @@ CFLAGS=-O
24#CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \ 24#CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
25# -Wstrict-prototypes -Wmissing-prototypes 25# -Wstrict-prototypes -Wmissing-prototypes
26 26
27SFLAGS=-O
28
27LDFLAGS=libz.a 29LDFLAGS=libz.a
28LDSHARED=$(CC) 30LDSHARED=$(CC)
29CPP=$(CC) -E 31CPP=$(CC) -E
30 32
31LIBS=libz.a 33LIBS=libz.a
32SHAREDLIB=libz.so 34SHAREDLIB=libz.so
33SHAREDLIBV=libz.so.1.2.3.1 35SHAREDLIBV=libz.so.1.2.3.2
34SHAREDLIBM=libz.so.1 36SHAREDLIBM=libz.so.1
35 37
36AR=ar 38AR=ar
@@ -47,12 +49,16 @@ mandir = ${prefix}/share/man
47man3dir = ${mandir}/man3 49man3dir = ${mandir}/man3
48pkgconfigdir = ${libdir}/pkgconfig 50pkgconfigdir = ${libdir}/pkgconfig
49 51
50OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \ 52OBJC = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \
51 zutil.o inflate.o infback.o inftrees.o inffast.o 53 zutil.o inflate.o infback.o inftrees.o inffast.o
52 54
53OBJA = 55OBJA =
54# to use the asm code: make OBJA=match.o 56# to use the asm code: make OBJA=match.o
55 57
58OBJS = $(OBJC) $(OBJA)
59
60PIC_OBJS = $(OBJS:%.o=%.lo)
61
56TEST_OBJS = example.o minigzip.o 62TEST_OBJS = example.o minigzip.o
57 63
58all: example$(EXE) minigzip$(EXE) 64all: example$(EXE) minigzip$(EXE)
@@ -68,8 +74,8 @@ test: all
68 echo ' *** zlib test FAILED ***'; \ 74 echo ' *** zlib test FAILED ***'; \
69 fi 75 fi
70 76
71libz.a: $(OBJS) $(OBJA) 77libz.a: $(OBJS)
72 $(AR) $@ $(OBJS) $(OBJA) 78 $(AR) $@ $(OBJS)
73 -@ ($(RANLIB) $@ || true) >/dev/null 2>&1 79 -@ ($(RANLIB) $@ || true) >/dev/null 2>&1
74 80
75match.o: match.S 81match.o: match.S
@@ -78,8 +84,17 @@ match.o: match.S
78 mv _match.o match.o 84 mv _match.o match.o
79 rm -f _match.s 85 rm -f _match.s
80 86
81$(SHAREDLIBV): $(OBJS) 87match.lo: match.S
82 $(LDSHARED) -o $@ $(OBJS) 88 $(CPP) match.S > _match.s
89 $(CC) -c -fPIC _match.s
90 mv _match.o match.lo
91 rm -f _match.s
92
93%.lo: %.c
94 $(CC) $(SFLAGS) -DPIC -c $< -o $@
95
96$(SHAREDLIBV): $(PIC_OBJS)
97 $(LDSHARED) -o $@ $(PIC_OBJS) -lc
83 rm -f $(SHAREDLIB) $(SHAREDLIBM) 98 rm -f $(SHAREDLIB) $(SHAREDLIBM)
84 ln -s $@ $(SHAREDLIB) 99 ln -s $@ $(SHAREDLIB)
85 ln -s $@ $(SHAREDLIBM) 100 ln -s $@ $(SHAREDLIBM)
@@ -90,14 +105,11 @@ example$(EXE): example.o $(LIBS)
90minigzip$(EXE): minigzip.o $(LIBS) 105minigzip$(EXE): minigzip.o $(LIBS)
91 $(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS) 106 $(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS)
92 107
93install: $(LIBS) 108install-libs: $(LIBS)
94 -@if [ ! -d $(DESTDIR)$(exec_prefix) ]; then mkdir -p $(DESTDIR)$(exec_prefix); fi 109 -@if [ ! -d $(DESTDIR)$(exec_prefix) ]; then mkdir -p $(DESTDIR)$(exec_prefix); fi
95 -@if [ ! -d $(DESTDIR)$(includedir) ]; then mkdir -p $(DESTDIR)$(includedir); fi
96 -@if [ ! -d $(DESTDIR)$(libdir) ]; then mkdir -p $(DESTDIR)$(libdir); fi 110 -@if [ ! -d $(DESTDIR)$(libdir) ]; then mkdir -p $(DESTDIR)$(libdir); fi
97 -@if [ ! -d $(DESTDIR)$(man3dir) ]; then mkdir -p $(DESTDIR)$(man3dir); fi 111 -@if [ ! -d $(DESTDIR)$(man3dir) ]; then mkdir -p $(DESTDIR)$(man3dir); fi
98 -@if [ ! -d $(DESTDIR)$(pkgconfigdir) ]; then mkdir -p $(DESTDIR)$(pkgconfigdir); fi 112 -@if [ ! -d $(DESTDIR)$(pkgconfigdir) ]; then mkdir -p $(DESTDIR)$(pkgconfigdir); fi
99 cp zlib.h zconf.h $(DESTDIR)$(includedir)
100 chmod 644 $(DESTDIR)$(includedir)/zlib.h $(DESTDIR)$(includedir)/zconf.h
101 cp $(LIBS) $(DESTDIR)$(libdir) 113 cp $(LIBS) $(DESTDIR)$(libdir)
102 cd $(DESTDIR)$(libdir); chmod 755 $(LIBS) 114 cd $(DESTDIR)$(libdir); chmod 755 $(LIBS)
103 -@(cd $(DESTDIR)$(libdir); $(RANLIB) libz.a || true) >/dev/null 2>&1 115 -@(cd $(DESTDIR)$(libdir); $(RANLIB) libz.a || true) >/dev/null 2>&1
@@ -114,8 +126,13 @@ install: $(LIBS)
114# The ranlib in install is needed on NeXTSTEP which checks file times 126# The ranlib in install is needed on NeXTSTEP which checks file times
115# ldconfig is for Linux 127# ldconfig is for Linux
116 128
129install: install-libs
130 -@if [ ! -d $(DESTDIR)$(includedir) ]; then mkdir -p $(DESTDIR)$(includedir); fi
131 cp zlib.h zconf.h zlibdefs.h $(DESTDIR)$(includedir)
132 chmod 644 $(DESTDIR)$(includedir)/zlib.h $(DESTDIR)$(includedir)/zconf.h $(DESTDIR)$(includedir)/zlibdefs.h
133
117uninstall: 134uninstall:
118 cd $(DESTDIR)$(includedir); rm -f zlib.h zconf.h 135 cd $(DESTDIR)$(includedir); rm -f zlib.h zconf.h zlibdefs.h
119 cd $(DESTDIR)$(libdir); rm -f libz.a; \ 136 cd $(DESTDIR)$(libdir); rm -f libz.a; \
120 if test -f $(SHAREDLIBV); then \ 137 if test -f $(SHAREDLIBV); then \
121 rm -f $(SHAREDLIBV) $(SHAREDLIB) $(SHAREDLIBM); \ 138 rm -f $(SHAREDLIBV) $(SHAREDLIB) $(SHAREDLIBM); \
@@ -125,14 +142,15 @@ uninstall:
125 142
126mostlyclean: clean 143mostlyclean: clean
127clean: 144clean:
128 rm -f *.o *~ example$(EXE) minigzip$(EXE) \ 145 rm -f *.o *.lo *~ example$(EXE) minigzip$(EXE) \
129 libz.* foo.gz so_locations \ 146 libz.* foo.gz so_locations \
130 _match.s maketree contrib/infback9/*.o 147 _match.s maketree contrib/infback9/*.o
131 148
132maintainer-clean: distclean 149maintainer-clean: distclean
133distclean: clean 150distclean: clean
134 cp -p Makefile.in Makefile 151 cp -p Makefile.in Makefile
135 cp -p zconf.in.h zconf.h 152 rm zlibdefs.h
153 touch -r configure zlibdefs.h
136 rm -f zlib.pc .DS_Store 154 rm -f zlib.pc .DS_Store
137 155
138tags: 156tags:
@@ -143,17 +161,32 @@ depend:
143 161
144# DO NOT DELETE THIS LINE -- make depend depends on it. 162# DO NOT DELETE THIS LINE -- make depend depends on it.
145 163
146adler32.o: zlib.h zconf.h 164adler32.o: zlib.h zconf.h zlibdefs.h
147compress.o: zlib.h zconf.h 165compress.o: zlib.h zconf.h zlibdefs.h
148crc32.o: crc32.h zlib.h zconf.h 166crc32.o: crc32.h zlib.h zconf.h zlibdefs.h
149deflate.o: deflate.h zutil.h zlib.h zconf.h 167deflate.o: deflate.h zutil.h zlib.h zconf.h zlibdefs.h
150example.o: zlib.h zconf.h 168example.o: zlib.h zconf.h zlibdefs.h
151gzio.o: zutil.h zlib.h zconf.h 169gzio.o: zutil.h zlib.h zconf.h zlibdefs.h
152inffast.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h 170inffast.o: zutil.h zlib.h zconf.h zlibdefs.h inftrees.h inflate.h inffast.h
153inflate.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h 171inflate.o: zutil.h zlib.h zconf.h zlibdefs.h inftrees.h inflate.h inffast.h inffixed.h
154infback.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h 172infback.o: zutil.h zlib.h zconf.h zlibdefs.h inftrees.h inflate.h inffast.h inffixed.h
155inftrees.o: zutil.h zlib.h zconf.h inftrees.h 173inftrees.o: zutil.h zlib.h zconf.h zlibdefs.h inftrees.h
156minigzip.o: zlib.h zconf.h 174minigzip.o: zlib.h zconf.h zlibdefs.h
157trees.o: deflate.h zutil.h zlib.h zconf.h trees.h 175trees.o: deflate.h zutil.h zlib.h zconf.h zlibdefs.h trees.h
158uncompr.o: zlib.h zconf.h 176uncompr.o: zlib.h zconf.h zlibdefs.h
159zutil.o: zutil.h zlib.h zconf.h 177zutil.o: zutil.h zlib.h zconf.h zlibdefs.h
178
179adler32.lo: zlib.h zconf.h zlibdefs.h
180compress.lo: zlib.h zconf.h zlibdefs.h
181crc32.lo: crc32.h zlib.h zconf.h zlibdefs.h
182deflate.lo: deflate.h zutil.h zlib.h zconf.h zlibdefs.h
183example.lo: zlib.h zconf.h zlibdefs.h
184gzio.lo: zutil.h zlib.h zconf.h zlibdefs.h
185inffast.lo: zutil.h zlib.h zconf.h zlibdefs.h inftrees.h inflate.h inffast.h
186inflate.lo: zutil.h zlib.h zconf.h zlibdefs.h inftrees.h inflate.h inffast.h inffixed.h
187infback.lo: zutil.h zlib.h zconf.h zlibdefs.h inftrees.h inflate.h inffast.h inffixed.h
188inftrees.lo: zutil.h zlib.h zconf.h zlibdefs.h inftrees.h
189minigzip.lo: zlib.h zconf.h zlibdefs.h
190trees.lo: deflate.h zutil.h zlib.h zconf.h zlibdefs.h trees.h
191uncompr.lo: zlib.h zconf.h zlibdefs.h
192zutil.lo: zutil.h zlib.h zconf.h zlibdefs.h
diff --git a/README b/README
index ce6f341..e22d1fa 100644
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
1ZLIB DATA COMPRESSION LIBRARY 1ZLIB DATA COMPRESSION LIBRARY
2 2
3zlib 1.2.3.1 is a general purpose data compression library. All the code is 3zlib 1.2.3.2 is a general purpose data compression library. All the code is
4thread safe. The data format used by the zlib library is described by RFCs 4thread safe. The data format used by the zlib library is described by RFCs
5(Request for Comments) 1950 to 1952 in the files 5(Request for Comments) 1950 to 1952 in the files
6http://www.ietf.org/rfc/rfc1950.txt (zlib format), rfc1951.txt (deflate format) 6http://www.ietf.org/rfc/rfc1950.txt (zlib format), rfc1951.txt (deflate format)
@@ -33,7 +33,7 @@ Mark Nelson <markn@ieee.org> wrote an article about zlib for the Jan. 1997
33issue of Dr. Dobb's Journal; a copy of the article is available in 33issue of Dr. Dobb's Journal; a copy of the article is available in
34http://dogma.net/markn/articles/zlibtool/zlibtool.htm 34http://dogma.net/markn/articles/zlibtool/zlibtool.htm
35 35
36The changes made in version 1.2.3.1 are documented in the file ChangeLog. 36The changes made in version 1.2.3.2 are documented in the file ChangeLog.
37 37
38Unsupported third party contributions are provided in directory "contrib". 38Unsupported third party contributions are provided in directory "contrib".
39 39
diff --git a/as400/zlib.inc b/as400/zlib.inc
index c782d73..fcf1791 100644
--- a/as400/zlib.inc
+++ b/as400/zlib.inc
@@ -1,7 +1,7 @@
1 * ZLIB.INC - Interface to the general purpose compression library 1 * ZLIB.INC - Interface to the general purpose compression library
2 * 2 *
3 * ILE RPG400 version by Patrick Monnerat, DATASPHERE. 3 * ILE RPG400 version by Patrick Monnerat, DATASPHERE.
4 * Version 1.2.3.1 4 * Version 1.2.3.2
5 * 5 *
6 * 6 *
7 * WARNING: 7 * WARNING:
@@ -22,8 +22,8 @@
22 * 22 *
23 * Versioning information. 23 * Versioning information.
24 * 24 *
25 D ZLIB_VERSION C '1.2.3.1' 25 D ZLIB_VERSION C '1.2.3.2'
26 D ZLIB_VERNUM C X'1231' 26 D ZLIB_VERNUM C X'1232'
27 * 27 *
28 * Other equates. 28 * Other equates.
29 * 29 *
diff --git a/configure b/configure
index f1b769b..6e8060e 100755
--- a/configure
+++ b/configure
@@ -79,7 +79,7 @@ esac
79if test "$gcc" -eq 1 && ($cc -c $cflags $test.c) 2>/dev/null; then 79if test "$gcc" -eq 1 && ($cc -c $cflags $test.c) 2>/dev/null; then
80 CC="$cc" 80 CC="$cc"
81 SFLAGS="${CFLAGS-"-O3"} -fPIC" 81 SFLAGS="${CFLAGS-"-O3"} -fPIC"
82 CFLAGS="$cflags" 82 CFLAGS="${CFLAGS-"-O3"}"
83 case `(uname -s || echo unknown) 2>/dev/null` in 83 case `(uname -s || echo unknown) 2>/dev/null` in
84 Linux | linux | GNU | GNU/*) LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1,--version-script,zlib.map"};; 84 Linux | linux | GNU | GNU/*) LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1,--version-script,zlib.map"};;
85 CYGWIN* | Cygwin* | cygwin* | OS/2* ) 85 CYGWIN* | Cygwin* | cygwin* | OS/2* )
@@ -184,8 +184,7 @@ if test $shared -eq 1; then
184 # we must test in two steps (cc then ld), required at least on SunOS 4.x 184 # we must test in two steps (cc then ld), required at least on SunOS 4.x
185 if test "`($CC -c $SFLAGS $test.c) 2>&1`" = "" && 185 if test "`($CC -c $SFLAGS $test.c) 2>&1`" = "" &&
186 test "`($LDSHARED -o $test$shared_ext $test.o) 2>&1`" = ""; then 186 test "`($LDSHARED -o $test$shared_ext $test.o) 2>&1`" = ""; then
187 CFLAGS="$SFLAGS" 187 LIBS="$LIBS $SHAREDLIBV"
188 LIBS="$SHAREDLIBV"
189 echo Building shared library $SHAREDLIBV with $CC. 188 echo Building shared library $SHAREDLIBV with $CC.
190 elif test -z "$old_cc" -a -z "$old_cflags"; then 189 elif test -z "$old_cc" -a -z "$old_cflags"; then
191 echo No shared library support. 190 echo No shared library support.
@@ -202,8 +201,29 @@ fi
202if test $shared -eq 0; then 201if test $shared -eq 0; then
203 LDSHARED="$CC" 202 LDSHARED="$CC"
204 echo Building static library $LIBS version $VER with $CC. 203 echo Building static library $LIBS version $VER with $CC.
204fi
205
206cat > zlibdefs.h << EOF
207/* zlibdefs.h -- compile-time definitions for the zlib compression library
208 * Copyright (C) 1995-2006 Jean-loup Gailly.
209 * For conditions of distribution and use, see copyright notice in zlib.h
210 */
211
212EOF
213
214cat > $test.c <<EOF
215#include <sys/types.h>
216off64_t dummy = 0;
217EOF
218if test "`($CC -c $CFLAGS -D_LARGEFILE64_SOURCE $test.c) 2>&1`" = ""; then
219 cat >> zlibdefs.h <<EOF
220#define z_off_t off64_t
221EOF
222 CFLAGS="${CFLAGS} -D_LARGEFILE64_SOURCE"
223 SFLAGS="${SFLAGS} -D_LARGEFILE64_SOURCE"
224 echo "Checking for off64_t... Yes."
205else 225else
206 LDFLAGS="-L. ${SHAREDLIBV}" 226 echo "Checking for off64_t... No."
207fi 227fi
208 228
209cat > $test.c <<EOF 229cat > $test.c <<EOF
@@ -211,10 +231,18 @@ cat > $test.c <<EOF
211int main() { return 0; } 231int main() { return 0; }
212EOF 232EOF
213if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then 233if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then
214 sed < zconf.in.h "/HAVE_UNISTD_H/s%0%1%" > zconf.h 234 cat >> zlibdefs.h <<EOF
235#include <sys/types.h> /* for off_t */
236#include <unistd.h> /* for SEEK_* and off_t */
237#ifdef VMS
238# include <unixio.h> /* for off_t */
239#endif
240#ifndef z_off_t
241# define z_off_t off_t
242#endif
243EOF
215 echo "Checking for unistd.h... Yes." 244 echo "Checking for unistd.h... Yes."
216else 245else
217 cp -p zconf.in.h zconf.h
218 echo "Checking for unistd.h... No." 246 echo "Checking for unistd.h... No."
219fi 247fi
220 248
@@ -462,6 +490,7 @@ rm -f $test.[co] $test $test$shared_ext
462sed < Makefile.in " 490sed < Makefile.in "
463/^CC *=/s#=.*#=$CC# 491/^CC *=/s#=.*#=$CC#
464/^CFLAGS *=/s#=.*#=$CFLAGS# 492/^CFLAGS *=/s#=.*#=$CFLAGS#
493/^SFLAGS *=/s#=.*#=$SFLAGS#
465/^CPP *=/s#=.*#=$CPP# 494/^CPP *=/s#=.*#=$CPP#
466/^LDSHARED *=/s#=.*#=$LDSHARED# 495/^LDSHARED *=/s#=.*#=$LDSHARED#
467/^LIBS *=/s#=.*#=$LIBS# 496/^LIBS *=/s#=.*#=$LIBS#
diff --git a/contrib/infback9/inftree9.c b/contrib/infback9/inftree9.c
index 658f87f..dede93b 100644
--- a/contrib/infback9/inftree9.c
+++ b/contrib/infback9/inftree9.c
@@ -1,5 +1,5 @@
1/* inftree9.c -- generate Huffman trees for efficient decoding 1/* inftree9.c -- generate Huffman trees for efficient decoding
2 * Copyright (C) 1995-2005 Mark Adler 2 * Copyright (C) 1995-2006 Mark Adler
3 * For conditions of distribution and use, see copyright notice in zlib.h 3 * For conditions of distribution and use, see copyright notice in zlib.h
4 */ 4 */
5 5
@@ -9,7 +9,7 @@
9#define MAXBITS 15 9#define MAXBITS 15
10 10
11const char inflate9_copyright[] = 11const char inflate9_copyright[] =
12 " inflate9 1.2.3.1 Copyright 1995-2005 Mark Adler "; 12 " inflate9 1.2.3.2 Copyright 1995-2006 Mark Adler ";
13/* 13/*
14 If you use the zlib library in a product, an acknowledgment is welcome 14 If you use the zlib library in a product, an acknowledgment is welcome
15 in the documentation of your product. If for some reason you cannot 15 in the documentation of your product. If for some reason you cannot
@@ -64,7 +64,7 @@ unsigned short FAR *work;
64 static const unsigned short lext[31] = { /* Length codes 257..285 extra */ 64 static const unsigned short lext[31] = { /* Length codes 257..285 extra */
65 128, 128, 128, 128, 128, 128, 128, 128, 129, 129, 129, 129, 65 128, 128, 128, 128, 128, 128, 128, 128, 129, 129, 129, 129,
66 130, 130, 130, 130, 131, 131, 131, 131, 132, 132, 132, 132, 66 130, 130, 130, 130, 131, 131, 131, 131, 132, 132, 132, 132,
67 133, 133, 133, 133, 144, 74, 196}; 67 133, 133, 133, 133, 144, 192, 204};
68 static const unsigned short dbase[32] = { /* Distance codes 0..31 base */ 68 static const unsigned short dbase[32] = { /* Distance codes 0..31 base */
69 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 69 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49,
70 65, 97, 129, 193, 257, 385, 513, 769, 1025, 1537, 2049, 3073, 70 65, 97, 129, 193, 257, 385, 513, 769, 1025, 1537, 2049, 3073,
diff --git a/contrib/minizip/unzip.c b/contrib/minizip/unzip.c
index 9ad4766..e115663 100644
--- a/contrib/minizip/unzip.c
+++ b/contrib/minizip/unzip.c
@@ -1163,6 +1163,8 @@ extern int ZEXPORT unzOpenCurrentFile3 (file, method, level, raw, password)
1163 1163
1164 s->pfile_in_zip_read = pfile_in_zip_read_info; 1164 s->pfile_in_zip_read = pfile_in_zip_read_info;
1165 1165
1166 s->encrypted = 0;
1167
1166# ifndef NOUNCRYPT 1168# ifndef NOUNCRYPT
1167 if (password != NULL) 1169 if (password != NULL)
1168 { 1170 {
diff --git a/contrib/vstudio/vc7/zlib.rc b/contrib/vstudio/vc7/zlib.rc
index c27d0fa..71d827b 100644
--- a/contrib/vstudio/vc7/zlib.rc
+++ b/contrib/vstudio/vc7/zlib.rc
@@ -2,8 +2,8 @@
2 2
3#define IDR_VERSION1 1 3#define IDR_VERSION1 1
4IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE 4IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE
5 FILEVERSION 1,2,3,1 5 FILEVERSION 1,2,3,2
6 PRODUCTVERSION 1,2,3,1 6 PRODUCTVERSION 1,2,3,2
7 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK 7 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
8 FILEFLAGS 0 8 FILEFLAGS 0
9 FILEOS VOS_DOS_WINDOWS32 9 FILEOS VOS_DOS_WINDOWS32
@@ -17,12 +17,12 @@ BEGIN
17 17
18 BEGIN 18 BEGIN
19 VALUE "FileDescription", "zlib data compression library\0" 19 VALUE "FileDescription", "zlib data compression library\0"
20 VALUE "FileVersion", "1.2.3.1\0" 20 VALUE "FileVersion", "1.2.3.2\0"
21 VALUE "InternalName", "zlib\0" 21 VALUE "InternalName", "zlib\0"
22 VALUE "OriginalFilename", "zlib.dll\0" 22 VALUE "OriginalFilename", "zlib.dll\0"
23 VALUE "ProductName", "ZLib.DLL\0" 23 VALUE "ProductName", "ZLib.DLL\0"
24 VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0" 24 VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
25 VALUE "LegalCopyright", "(C) 1995-2003 Jean-loup Gailly & Mark Adler\0" 25 VALUE "LegalCopyright", "(C) 1995-2006 Jean-loup Gailly & Mark Adler\0"
26 END 26 END
27 END 27 END
28 BLOCK "VarFileInfo" 28 BLOCK "VarFileInfo"
diff --git a/deflate.c b/deflate.c
index ccffede..181159e 100644
--- a/deflate.c
+++ b/deflate.c
@@ -1,5 +1,5 @@
1/* deflate.c -- compress data using the deflation algorithm 1/* deflate.c -- compress data using the deflation algorithm
2 * Copyright (C) 1995-2005 Jean-loup Gailly. 2 * Copyright (C) 1995-2006 Jean-loup Gailly.
3 * For conditions of distribution and use, see copyright notice in zlib.h 3 * For conditions of distribution and use, see copyright notice in zlib.h
4 */ 4 */
5 5
@@ -52,7 +52,7 @@
52#include "deflate.h" 52#include "deflate.h"
53 53
54const char deflate_copyright[] = 54const char deflate_copyright[] =
55 " deflate 1.2.3.1 Copyright 1995-2005 Jean-loup Gailly "; 55 " deflate 1.2.3.2 Copyright 1995-2006 Jean-loup Gailly ";
56/* 56/*
57 If you use the zlib library in a product, an acknowledgment is welcome 57 If you use the zlib library in a product, an acknowledgment is welcome
58 in the documentation of your product. If for some reason you cannot 58 in the documentation of your product. If for some reason you cannot
diff --git a/inftrees.c b/inftrees.c
index b69a1f9..4ae6502 100644
--- a/inftrees.c
+++ b/inftrees.c
@@ -1,5 +1,5 @@
1/* inftrees.c -- generate Huffman trees for efficient decoding 1/* inftrees.c -- generate Huffman trees for efficient decoding
2 * Copyright (C) 1995-2005 Mark Adler 2 * Copyright (C) 1995-2006 Mark Adler
3 * For conditions of distribution and use, see copyright notice in zlib.h 3 * For conditions of distribution and use, see copyright notice in zlib.h
4 */ 4 */
5 5
@@ -9,7 +9,7 @@
9#define MAXBITS 15 9#define MAXBITS 15
10 10
11const char inflate_copyright[] = 11const char inflate_copyright[] =
12 " inflate 1.2.3.1 Copyright 1995-2005 Mark Adler "; 12 " inflate 1.2.3.2 Copyright 1995-2006 Mark Adler ";
13/* 13/*
14 If you use the zlib library in a product, an acknowledgment is welcome 14 If you use the zlib library in a product, an acknowledgment is welcome
15 in the documentation of your product. If for some reason you cannot 15 in the documentation of your product. If for some reason you cannot
@@ -62,7 +62,7 @@ unsigned short FAR *work;
62 35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0}; 62 35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0};
63 static const unsigned short lext[31] = { /* Length codes 257..285 extra */ 63 static const unsigned short lext[31] = { /* Length codes 257..285 extra */
64 16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18, 64 16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18,
65 19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 74, 196}; 65 19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 192, 204};
66 static const unsigned short dbase[32] = { /* Distance codes 0..29 base */ 66 static const unsigned short dbase[32] = { /* Distance codes 0..29 base */
67 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193, 67 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
68 257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145, 68 257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
diff --git a/make_vms.com b/make_vms.com
index aa4e461..c8fa6a5 100644
--- a/make_vms.com
+++ b/make_vms.com
@@ -77,40 +77,40 @@ $ if make.eqs.""
77$ then 77$ then
78$ dele example.obj;*,minigzip.obj;* 78$ dele example.obj;*,minigzip.obj;*
79$ CALL MAKE adler32.OBJ "CC ''CCOPT' adler32" - 79$ CALL MAKE adler32.OBJ "CC ''CCOPT' adler32" -
80 adler32.c zlib.h zconf.h 80 adler32.c zlib.h zconf.h zlibdefs.h
81$ CALL MAKE compress.OBJ "CC ''CCOPT' compress" - 81$ CALL MAKE compress.OBJ "CC ''CCOPT' compress" -
82 compress.c zlib.h zconf.h 82 compress.c zlib.h zconf.h zlibdefs.h
83$ CALL MAKE crc32.OBJ "CC ''CCOPT' crc32" - 83$ CALL MAKE crc32.OBJ "CC ''CCOPT' crc32" -
84 crc32.c zlib.h zconf.h 84 crc32.c zlib.h zconf.h zlibdefs.h
85$ CALL MAKE deflate.OBJ "CC ''CCOPT' deflate" - 85$ CALL MAKE deflate.OBJ "CC ''CCOPT' deflate" -
86 deflate.c deflate.h zutil.h zlib.h zconf.h 86 deflate.c deflate.h zutil.h zlib.h zconf.h zlibdefs.h
87$ CALL MAKE gzio.OBJ "CC ''CCOPT' gzio" - 87$ CALL MAKE gzio.OBJ "CC ''CCOPT' gzio" -
88 gzio.c zutil.h zlib.h zconf.h 88 gzio.c zutil.h zlib.h zconf.h zlibdefs.h
89$ CALL MAKE infback.OBJ "CC ''CCOPT' infback" - 89$ CALL MAKE infback.OBJ "CC ''CCOPT' infback" -
90 infback.c zutil.h inftrees.h inflate.h inffast.h inffixed.h 90 infback.c zutil.h inftrees.h inflate.h inffast.h inffixed.h
91$ CALL MAKE inffast.OBJ "CC ''CCOPT' inffast" - 91$ CALL MAKE inffast.OBJ "CC ''CCOPT' inffast" -
92 inffast.c zutil.h zlib.h zconf.h inffast.h 92 inffast.c zutil.h zlib.h zconf.h zlibdefs.h inffast.h
93$ CALL MAKE inflate.OBJ "CC ''CCOPT' inflate" - 93$ CALL MAKE inflate.OBJ "CC ''CCOPT' inflate" -
94 inflate.c zutil.h zlib.h zconf.h infblock.h 94 inflate.c zutil.h zlib.h zconf.h zlibdefs.h infblock.h
95$ CALL MAKE inftrees.OBJ "CC ''CCOPT' inftrees" - 95$ CALL MAKE inftrees.OBJ "CC ''CCOPT' inftrees" -
96 inftrees.c zutil.h zlib.h zconf.h inftrees.h 96 inftrees.c zutil.h zlib.h zconf.h zlibdefs.h inftrees.h
97$ CALL MAKE trees.OBJ "CC ''CCOPT' trees" - 97$ CALL MAKE trees.OBJ "CC ''CCOPT' trees" -
98 trees.c deflate.h zutil.h zlib.h zconf.h 98 trees.c deflate.h zutil.h zlib.h zconf.h zlibdefs.h
99$ CALL MAKE uncompr.OBJ "CC ''CCOPT' uncompr" - 99$ CALL MAKE uncompr.OBJ "CC ''CCOPT' uncompr" -
100 uncompr.c zlib.h zconf.h 100 uncompr.c zlib.h zconf.h zlibdefs.h
101$ CALL MAKE zutil.OBJ "CC ''CCOPT' zutil" - 101$ CALL MAKE zutil.OBJ "CC ''CCOPT' zutil" -
102 zutil.c zutil.h zlib.h zconf.h 102 zutil.c zutil.h zlib.h zconf.h zlibdefs.h
103$ write sys$output "Building Zlib ..." 103$ write sys$output "Building Zlib ..."
104$ CALL MAKE libz.OLB "lib/crea libz.olb *.obj" *.OBJ 104$ CALL MAKE libz.OLB "lib/crea libz.olb *.obj" *.OBJ
105$ write sys$output "Building example..." 105$ write sys$output "Building example..."
106$ CALL MAKE example.OBJ "CC ''CCOPT' example" - 106$ CALL MAKE example.OBJ "CC ''CCOPT' example" -
107 example.c zlib.h zconf.h 107 example.c zlib.h zconf.h zlibdefs.h
108$ call make example.exe "LINK example,libz.olb/lib" example.obj libz.olb 108$ call make example.exe "LINK example,libz.olb/lib" example.obj libz.olb
109$ if f$search("x11vms:xvmsutils.olb") .nes. "" 109$ if f$search("x11vms:xvmsutils.olb") .nes. ""
110$ then 110$ then
111$ write sys$output "Building minigzip..." 111$ write sys$output "Building minigzip..."
112$ CALL MAKE minigzip.OBJ "CC ''CCOPT' minigzip" - 112$ CALL MAKE minigzip.OBJ "CC ''CCOPT' minigzip" -
113 minigzip.c zlib.h zconf.h 113 minigzip.c zlib.h zconf.h zlibdefs.h
114$ call make minigzip.exe - 114$ call make minigzip.exe -
115 "LINK minigzip,libz.olb/lib,x11vms:xvmsutils.olb/lib" - 115 "LINK minigzip,libz.olb/lib,x11vms:xvmsutils.olb/lib" -
116 minigzip.obj libz.olb 116 minigzip.obj libz.olb
@@ -328,19 +328,19 @@ clean :
328 328
329 329
330# Other dependencies. 330# Other dependencies.
331adler32.obj : adler32.c zutil.h zlib.h zconf.h 331adler32.obj : adler32.c zutil.h zlib.h zconf.h zlibdefs.h
332compress.obj : compress.c zlib.h zconf.h 332compress.obj : compress.c zlib.h zconf.h zlibdefs.h
333crc32.obj : crc32.c zutil.h zlib.h zconf.h 333crc32.obj : crc32.c zutil.h zlib.h zconf.h zlibdefs.h
334deflate.obj : deflate.c deflate.h zutil.h zlib.h zconf.h 334deflate.obj : deflate.c deflate.h zutil.h zlib.h zconf.h zlibdefs.h
335example.obj : example.c zlib.h zconf.h 335example.obj : example.c zlib.h zconf.h zlibdefs.h
336gzio.obj : gzio.c zutil.h zlib.h zconf.h 336gzio.obj : gzio.c zutil.h zlib.h zconf.h zlibdefs.h
337inffast.obj : inffast.c zutil.h zlib.h zconf.h inftrees.h inffast.h 337inffast.obj : inffast.c zutil.h zlib.h zconf.h zlibdefs.h inftrees.h inffast.h
338inflate.obj : inflate.c zutil.h zlib.h zconf.h 338inflate.obj : inflate.c zutil.h zlib.h zconf.h zlibdefs.h
339inftrees.obj : inftrees.c zutil.h zlib.h zconf.h inftrees.h 339inftrees.obj : inftrees.c zutil.h zlib.h zconf.h zlibdefs.h inftrees.h
340minigzip.obj : minigzip.c zlib.h zconf.h 340minigzip.obj : minigzip.c zlib.h zconf.h zlibdefs.h
341trees.obj : trees.c deflate.h zutil.h zlib.h zconf.h 341trees.obj : trees.c deflate.h zutil.h zlib.h zconf.h zlibdefs.h
342uncompr.obj : uncompr.c zlib.h zconf.h 342uncompr.obj : uncompr.c zlib.h zconf.h zlibdefs.h
343zutil.obj : zutil.c zutil.h zlib.h zconf.h 343zutil.obj : zutil.c zutil.h zlib.h zconf.h zlibdefs.h
344infback.obj : infback.c zutil.h inftrees.h inflate.h inffast.h inffixed.h 344infback.obj : infback.c zutil.h inftrees.h inflate.h inffast.h inffixed.h
345$ eod 345$ eod
346$ close out 346$ close out
diff --git a/qnx/package.qpg b/qnx/package.qpg
index bd93d05..b7e8bf7 100644
--- a/qnx/package.qpg
+++ b/qnx/package.qpg
@@ -25,10 +25,10 @@
25 <QPG:Files> 25 <QPG:Files>
26 <QPG:Add file="../zconf.h" install="/opt/include/" user="root:sys" permission="644"/> 26 <QPG:Add file="../zconf.h" install="/opt/include/" user="root:sys" permission="644"/>
27 <QPG:Add file="../zlib.h" install="/opt/include/" user="root:sys" permission="644"/> 27 <QPG:Add file="../zlib.h" install="/opt/include/" user="root:sys" permission="644"/>
28 <QPG:Add file="../libz.so.1.2.3.1" install="/opt/lib/" user="root:bin" permission="644"/> 28 <QPG:Add file="../libz.so.1.2.3.2" install="/opt/lib/" user="root:bin" permission="644"/>
29 <QPG:Add file="libz.so" install="/opt/lib/" component="dev" filetype="symlink" linkto="libz.so.1.2.3.1"/> 29 <QPG:Add file="libz.so" install="/opt/lib/" component="dev" filetype="symlink" linkto="libz.so.1.2.3.2"/>
30 <QPG:Add file="libz.so.1" install="/opt/lib/" filetype="symlink" linkto="libz.so.1.2.3.1"/> 30 <QPG:Add file="libz.so.1" install="/opt/lib/" filetype="symlink" linkto="libz.so.1.2.3.2"/>
31 <QPG:Add file="../libz.so.1.2.3.1" install="/opt/lib/" component="slib"/> 31 <QPG:Add file="../libz.so.1.2.3.2" install="/opt/lib/" component="slib"/>
32 </QPG:Files> 32 </QPG:Files>
33 33
34 <QPG:PackageFilter> 34 <QPG:PackageFilter>
@@ -63,7 +63,7 @@
63 </QPM:ProductDescription> 63 </QPM:ProductDescription>
64 64
65 <QPM:ReleaseDescription> 65 <QPM:ReleaseDescription>
66 <QPM:ReleaseVersion>1.2.3.1</QPM:ReleaseVersion> 66 <QPM:ReleaseVersion>1.2.3.2</QPM:ReleaseVersion>
67 <QPM:ReleaseUrgency>Medium</QPM:ReleaseUrgency> 67 <QPM:ReleaseUrgency>Medium</QPM:ReleaseUrgency>
68 <QPM:ReleaseStability>Stable</QPM:ReleaseStability> 68 <QPM:ReleaseStability>Stable</QPM:ReleaseStability>
69 <QPM:ReleaseNoteMinor></QPM:ReleaseNoteMinor> 69 <QPM:ReleaseNoteMinor></QPM:ReleaseNoteMinor>
diff --git a/todo/Makefile-new b/todo/Makefile-new
deleted file mode 100644
index 8a09ebb..0000000
--- a/todo/Makefile-new
+++ /dev/null
@@ -1,201 +0,0 @@
1# Makefile for zlib
2# Copyright (C) 1995-2006 Jean-loup Gailly.
3# For conditions of distribution and use, see copyright notice in zlib.h
4
5# To compile and test, type:
6# ./configure; make test
7# The call of configure is optional if you don't have special requirements
8# If you wish to build zlib as a shared library, use: ./configure -s
9
10# To use the asm code, type:
11# cp contrib/asm?86/match.S ./match.S
12# make LOC=-DASMV OBJA=match.o
13
14# To install /usr/local/lib/libz.* and /usr/local/include/zlib.h, type:
15# make install
16# To install in $HOME instead of /usr/local, use:
17# make install prefix=$HOME
18
19CC=cc
20
21CFLAGS=-O
22#CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
23#CFLAGS=-g -DDEBUG
24#CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
25# -Wstrict-prototypes -Wmissing-prototypes
26
27SFLAGS=$(CFLAGS)
28#SFLAGS=$(CFLAGS) -fPIC
29
30LD=$(CC)
31LDFLAGS=libz.a
32LDSHARED=$(CC)
33CPP=$(CC) -E
34
35STATICLIB=libz.a
36SHAREDLIB=libz.so
37SHAREDLIBV=libz.so.1.2.3
38SHAREDLIBM=libz.so.1
39EXE=
40
41LIBS=$(STATICLIB) $(SHAREDLIBV)
42
43AR=ar rc
44RANLIB=ranlib
45TAR=tar
46SHELL=/bin/sh
47
48prefix=/usr/local
49exec_prefix=${prefix}
50libdir=${exec_prefix}/lib
51includedir=${prefix}/include
52mandir=${prefix}/share/man
53man3dir=${mandir}/man3
54pkgconfigdir = ${libdir}/pkgconfig
55
56OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \
57 zutil.o inflate.o infback.o inftrees.o inffast.o
58
59OBJA =
60#OBJA = match.o
61# to use the asm code: make OBJA=match.o
62
63TEST_OBJS = example.o minigzip.o
64
65OBJS_PIC = $(OBJS:.o=.pic.o)
66OBJA_PIC = $(OBJA:.o=.pic.o)
67
68.SUFFIXES: .c .o .pic.o
69
70.c.o:
71 $(CC) -c $(CFLAGS) -o $@ $*.c
72
73.c.pic.o:
74 $(CC) -c $(SFLAGS) -o $@ $*.c
75
76all: $(STATICLIB) example$(EXE) minigzip$(EXE)
77#all: $(STATICLIB) $(SHAREDLIBV) example$(EXE) minigzip$(EXE)
78
79check: test
80test: all
81 @LD_LIBRARY_PATH=.:$(LD_LIBRARY_PATH) ; export LD_LIBRARY_PATH; \
82 echo hello world | ./minigzip | ./minigzip -d || \
83 echo ' *** minigzip test FAILED ***' ; \
84 if ./example; then \
85 echo ' *** zlib test OK ***'; \
86 else \
87 echo ' *** zlib test FAILED ***'; \
88 fi
89
90match.o: match.S
91 $(CPP) match.S > _match.s
92 $(CC) -c _match.s
93 mv _match.o match.o
94 rm -f _match.s
95
96match.pic.o: match.S
97 $(CPP) match.S > _match.s
98 $(CC) -c -fPIC _match.s
99 mv _match.o match.pic.o
100 rm -f _match.s
101
102$(STATICLIB): $(OBJS) $(OBJA)
103 $(AR) $@ $(OBJS) $(OBJA)
104 -@ ($(RANLIB) $@ || true) >/dev/null 2>&1
105
106$(SHAREDLIBV): $(OBJS_PIC) $(OBJA_PIC)
107 $(LDSHARED) -o $@ $(OBJS_PIC) $(OBJA_PIC)
108 rm -f $(SHAREDLIB) $(SHAREDLIBM)
109 ln -s $@ $(SHAREDLIB)
110 ln -s $@ $(SHAREDLIBM)
111
112example$(EXE): example.o $(STATICLIB)
113 $(LD) -o $@ example.o $(LDFLAGS)
114
115minigzip$(EXE): minigzip.o $(STATICLIB)
116 $(LD) -o $@ minigzip.o $(LDFLAGS)
117
118install: $(LIBS)
119 mkdir -p $(DESTDIR)$(exec_prefix)
120 mkdir -p $(DESTDIR)$(includedir)
121 mkdir -p $(DESTDIR)$(libdir)
122 mkdir -p $(DESTDIR)$(man3dir)
123 mkdir -p $(DESTDIR)$(pkgconfigdir)
124 cp zlib.h zconf.h $(DESTDIR)$(includedir)
125 chmod 644 $(DESTDIR)$(includedir)/zlib.h $(DESTDIR)$(includedir)/zconf.h
126 cp $(LIBS) $(DESTDIR)$(libdir)
127 cd $(DESTDIR)$(libdir); chmod 755 $(LIBS)
128 -@(cd $(DESTDIR)$(libdir); $(RANLIB) $(STATICLIB) || true) >/dev/null 2>&1
129 cd $(DESTDIR)$(libdir); if test -f $(SHAREDLIBV); then \
130 rm -f $(SHAREDLIB) $(SHAREDLIBM); \
131 ln -s $(SHAREDLIBV) $(SHAREDLIB); \
132 ln -s $(SHAREDLIBV) $(SHAREDLIBM); \
133 (ldconfig || true) >/dev/null 2>&1; \
134 fi
135 cp zlib.3 $(DESTDIR)$(man3dir)
136 chmod 644 $(DESTDIR)$(man3dir)/zlib.3
137 cp zlib.pc $(DESTDIR)$(pkgconfigdir)
138 chmod 644 $(DESTDIR)$(pkgconfigdir)/zlib.pc
139# The ranlib in install is needed on NeXTSTEP which checks file times
140# ldconfig is for Linux
141
142uninstall:
143 cd $(DESTDIR)$(includedir); rm -f zlib.h zconf.h
144 cd $(DESTDIR)$(libdir); rm -f $(STATICLIB); \
145 if test -f $(SHAREDLIBV); then \
146 rm -f $(SHAREDLIBV) $(SHAREDLIB) $(SHAREDLIBM); \
147 fi
148 cd $(DESTDIR)$(man3dir); rm -f zlib.3
149 cd $(DESTDIR)$(pkgconfigdir); rm -f zlib.pc
150
151mostlyclean: clean
152clean:
153 rm -f *.o *~ example$(EXE) minigzip$(EXE) \
154 libz.* foo.gz so_locations \
155 _match.s maketree contrib/infback9/*.o
156
157maintainer-clean: distclean
158distclean: clean
159 cp -p Makefile.in Makefile
160 cp -p zconf.in.h zconf.h
161 rm -f zlib.pc .DS_Store
162
163tags:
164 etags *.[ch]
165
166depend:
167 makedepend -- $(CFLAGS) -- *.[ch]
168
169# "fake" targets: not real filenames and no deps (else "touch clean" defeats)
170.PHONY: install uninstall clean tags depend
171
172# DO NOT DELETE THIS LINE -- "make depend" depends on it.
173
174adler32.o: zlib.h zconf.h
175adler32.pic.o: zlib.h zconf.h
176compress.o: zlib.h zconf.h
177compress.pic.o: zlib.h zconf.h
178crc32.o: crc32.h zlib.h zconf.h
179crc32.pic.o: crc32.h zlib.h zconf.h
180deflate.o: deflate.h zutil.h zlib.h zconf.h
181deflate.pic.o: deflate.h zutil.h zlib.h zconf.h
182example.o: zlib.h zconf.h
183example.pic.o: zlib.h zconf.h
184gzio.o: zutil.h zlib.h zconf.h
185gzio.pic.o: zutil.h zlib.h zconf.h
186inffast.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
187inffast.pic.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
188inflate.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
189inflate.pic.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
190infback.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
191infback.pic.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
192inftrees.o: zutil.h zlib.h zconf.h inftrees.h
193inftrees.pic.o: zutil.h zlib.h zconf.h inftrees.h
194minigzip.o: zlib.h zconf.h
195minigzip.pic.o: zlib.h zconf.h
196trees.o: deflate.h zutil.h zlib.h zconf.h trees.h
197trees.pic.o: deflate.h zutil.h zlib.h zconf.h trees.h
198uncompr.o: zlib.h zconf.h
199uncompr.pic.o: zlib.h zconf.h
200zutil.o: zutil.h zlib.h zconf.h
201zutil.pic.o: zutil.h zlib.h zconf.h
diff --git a/todo/README b/todo/README
deleted file mode 100644
index f87a7df..0000000
--- a/todo/README
+++ /dev/null
@@ -1 +0,0 @@
1This "todo" directory contains works in progress. Nothing in here works, so don't try to use it!
diff --git a/treebuild.xml b/treebuild.xml
new file mode 100644
index 0000000..5ca9c9e
--- /dev/null
+++ b/treebuild.xml
@@ -0,0 +1,114 @@
1<?xml version="1.0" ?>
2<package name="zlib" version="1.2.3">
3 <library name="zlib" dlversion="1.2.3" dlname="z">
4 <property name="description"> zip compression library </property>
5 <property name="include-target-dir" value="$(@PACKAGE/install-includedir)" />
6
7 <!-- fixme: not implemented yet -->
8 <property name="compiler/c/inline" value="yes" />
9
10 <include-file name="zlib.h" scope="public" mode="644" />
11 <include-file name="zconf.h" scope="public" mode="644" />
12 <include-file name="zlibdefs.h" scope="public" mode="644" />
13
14 <source name="adler32.c">
15 <depend name="zlib.h" />
16 <depend name="zconf.h" />
17 <depend name="zlibdefs.h" />
18 </source>
19 <source name="compress.c">
20 <depend name="zlib.h" />
21 <depend name="zconf.h" />
22 <depend name="zlibdefs.h" />
23 </source>
24 <source name="crc32.c">
25 <depend name="zlib.h" />
26 <depend name="zconf.h" />
27 <depend name="zlibdefs.h" />
28 <depend name="crc32.h" />
29 </source>
30 <source name="gzio.c">
31 <depend name="zlib.h" />
32 <depend name="zconf.h" />
33 <depend name="zlibdefs.h" />
34 <depend name="zutil.h" />
35 </source>
36 <source name="uncompr.c">
37 <depend name="zlib.h" />
38 <depend name="zconf.h" />
39 <depend name="zlibdefs.h" />
40 </source>
41 <source name="deflate.c">
42 <depend name="zlib.h" />
43 <depend name="zconf.h" />
44 <depend name="zlibdefs.h" />
45 <depend name="zutil.h" />
46 <depend name="deflate.h" />
47 </source>
48 <source name="trees.c">
49 <depend name="zlib.h" />
50 <depend name="zconf.h" />
51 <depend name="zlibdefs.h" />
52 <depend name="zutil.h" />
53 <depend name="deflate.h" />
54 <depend name="trees.h" />
55 </source>
56 <source name="zutil.c">
57 <depend name="zlib.h" />
58 <depend name="zconf.h" />
59 <depend name="zlibdefs.h" />
60 <depend name="zutil.h" />
61 </source>
62 <source name="inflate.c">
63 <depend name="zlib.h" />
64 <depend name="zconf.h" />
65 <depend name="zlibdefs.h" />
66 <depend name="zutil.h" />
67 <depend name="inftrees.h" />
68 <depend name="inflate.h" />
69 <depend name="inffast.h" />
70 </source>
71 <source name="infback.c">
72 <depend name="zlib.h" />
73 <depend name="zconf.h" />
74 <depend name="zlibdefs.h" />
75 <depend name="zutil.h" />
76 <depend name="inftrees.h" />
77 <depend name="inflate.h" />
78 <depend name="inffast.h" />
79 </source>
80 <source name="inftrees.c">
81 <depend name="zlib.h" />
82 <depend name="zconf.h" />
83 <depend name="zlibdefs.h" />
84 <depend name="zutil.h" />
85 <depend name="inftrees.h" />
86 </source>
87 <source name="inffast.c">
88 <depend name="zlib.h" />
89 <depend name="zconf.h" />
90 <depend name="zlibdefs.h" />
91 <depend name="zutil.h" />
92 <depend name="inftrees.h" />
93 <depend name="inflate.h" />
94 <depend name="inffast.h" />
95 </source>
96 </library>
97</package>
98
99<!--
100CFLAGS=-O
101#CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
102#CFLAGS=-g -DDEBUG
103#CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
104# -Wstrict-prototypes -Wmissing-prototypes
105
106# OBJA =
107# to use the asm code: make OBJA=match.o
108#
109match.o: match.S
110 $(CPP) match.S > _match.s
111 $(CC) -c _match.s
112 mv _match.o match.o
113 rm -f _match.s
114-->
diff --git a/zconf.h b/zconf.h
index 5619c76..0a9f5a4 100644
--- a/zconf.h
+++ b/zconf.h
@@ -351,14 +351,8 @@ typedef uLong FAR uLongf;
351 typedef Byte *voidp; 351 typedef Byte *voidp;
352#endif 352#endif
353 353
354#if 0 /* HAVE_UNISTD_H -- this line is updated by ./configure */ 354#include "zlibdefs.h" /* created by configure */
355# include <sys/types.h> /* for off_t */ 355
356# include <unistd.h> /* for SEEK_* and off_t */
357# ifdef VMS
358# include <unixio.h> /* for off_t */
359# endif
360# define z_off_t off_t
361#endif
362#ifndef SEEK_SET 356#ifndef SEEK_SET
363# define SEEK_SET 0 /* Seek from beginning of file. */ 357# define SEEK_SET 0 /* Seek from beginning of file. */
364# define SEEK_CUR 1 /* Seek from current position. */ 358# define SEEK_CUR 1 /* Seek from current position. */
diff --git a/zconf.in.h b/zconf.in.h
deleted file mode 100644
index 5619c76..0000000
--- a/zconf.in.h
+++ /dev/null
@@ -1,396 +0,0 @@
1/* zconf.h -- configuration of the zlib compression library
2 * Copyright (C) 1995-2006 Jean-loup Gailly.
3 * For conditions of distribution and use, see copyright notice in zlib.h
4 */
5
6/* @(#) $Id$ */
7
8#ifndef ZCONF_H
9#define ZCONF_H
10
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
19/* all linked symbols */
20# define _dist_code z__dist_code
21# define _length_code z__length_code
22# define _tr_align z__tr_align
23# define _tr_flush_block z__tr_flush_block
24# define _tr_init z__tr_init
25# define _tr_stored_block z__tr_stored_block
26# define _tr_tally z__tr_tally
27# define adler32 z_adler32
28# define adler32_combine z_adler32_combine
29# define compress z_compress
30# define compress2 z_compress2
31# define compressBound z_compressBound
32# define crc32 z_crc32
33# define crc32_combine z_crc32_combine
34# define deflate z_deflate
35# define deflateBound z_deflateBound
36# define deflateCopy z_deflateCopy
37# define deflateEnd z_deflateEnd
38# define deflateInit2_ z_deflateInit2_
39# define deflateInit_ z_deflateInit_
40# define deflateParams z_deflateParams
41# define deflatePrime z_deflatePrime
42# define deflateReset z_deflateReset
43# define deflateSetDictionary z_deflateSetDictionary
44# define deflateSetHeader z_deflateSetHeader
45# define deflateTune z_deflateTune
46# define deflate_copyright z_deflate_copyright
47# define get_crc_table z_get_crc_table
48# define gzclearerr z_gzclearerr
49# define gzclose z_gzclose
50# define gzdirect z_gzdirect
51# define gzdopen z_gzdopen
52# define gzeof z_gzeof
53# define gzerror z_gzerror
54# define gzflush z_gzflush
55# define gzgetc z_gzgetc
56# define gzgets z_gzgets
57# define gzopen z_gzopen
58# define gzprintf z_gzprintf
59# define gzputc z_gzputc
60# define gzputs z_gzputs
61# define gzread z_gzread
62# define gzrewind z_gzrewind
63# define gzseek z_gzseek
64# define gzsetparams z_gzsetparams
65# define gztell z_gztell
66# define gzungetc z_gzungetc
67# define gzwrite z_gzwrite
68# define inflate z_inflate
69# define inflateBack z_inflateBack
70# define inflateBackEnd z_inflateBackEnd
71# define inflateBackInit_ z_inflateBackInit_
72# define inflateCopy z_inflateCopy
73# define inflateEnd z_inflateEnd
74# define inflateGetHeader z_inflateGetHeader
75# define inflateInit2_ z_inflateInit2_
76# define inflateInit_ z_inflateInit_
77# define inflatePrime z_inflatePrime
78# define inflateReset z_inflateReset
79# define inflateSetDictionary z_inflateSetDictionary
80# define inflateSync z_inflateSync
81# define inflateSyncPoint z_inflateSyncPoint
82# define inflate_copyright z_inflate_copyright
83# define inflate_fast z_inflate_fast
84# define inflate_table z_inflate_table
85# define uncompress z_uncompress
86# define zError z_zError
87# define z_errmsg z_z_errmsg
88# define zcalloc z_zcalloc
89# define zcfree z_zcfree
90# define zlibCompileFlags z_zlibCompileFlags
91# define zlibVersion z_zlibVersion
92
93/* all zlib typedefs in zlib.h and zconf.h */
94# define Byte z_Byte
95# define Bytef z_Bytef
96# define alloc_func z_alloc_func
97# define charf z_charf
98# define free_func z_free_func
99# define gzFile z_gzFile
100# define gz_header z_gz_header
101# define gz_headerp z_gz_headerp
102# define in_func z_in_func
103# define intf z_intf
104# define out_func z_out_func
105# define uInt z_uInt
106# define uIntf z_uIntf
107# define uLong z_uLong
108# define uLongf z_uLongf
109# define voidp z_voidp
110# define voidp z_voidp
111# define voidpc z_voidpc
112# define voidpc z_voidpc
113# define voidpf z_voidpf
114# define voidpf z_voidpf
115# define z_stream z_z_stream
116# define z_streamp z_z_streamp
117
118/* all zlib structs in zlib.h and zconf.h */
119# define gz_header_s z_gz_header_s
120# define internal_state z_internal_state
121# define z_stream_s z_z_stream_s
122
123#endif
124
125#if defined(__MSDOS__) && !defined(MSDOS)
126# define MSDOS
127#endif
128#if (defined(OS_2) || defined(__OS2__)) && !defined(OS2)
129# define OS2
130#endif
131#if defined(_WINDOWS) && !defined(WINDOWS)
132# define WINDOWS
133#endif
134#if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__)
135# ifndef WIN32
136# define WIN32
137# endif
138#endif
139#if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32)
140# if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__)
141# ifndef SYS16BIT
142# define SYS16BIT
143# endif
144# endif
145#endif
146
147/*
148 * Compile with -DMAXSEG_64K if the alloc function cannot allocate more
149 * than 64k bytes at a time (needed on systems with 16-bit int).
150 */
151#ifdef SYS16BIT
152# define MAXSEG_64K
153#endif
154#ifdef MSDOS
155# define UNALIGNED_OK
156#endif
157
158#ifdef __STDC_VERSION__
159# ifndef STDC
160# define STDC
161# endif
162# if __STDC_VERSION__ >= 199901L
163# ifndef STDC99
164# define STDC99
165# endif
166# endif
167#endif
168#if !defined(STDC) && (defined(__STDC__) || defined(__cplusplus))
169# define STDC
170#endif
171#if !defined(STDC) && (defined(__GNUC__) || defined(__BORLANDC__))
172# define STDC
173#endif
174#if !defined(STDC) && (defined(MSDOS) || defined(WINDOWS) || defined(WIN32))
175# define STDC
176#endif
177#if !defined(STDC) && (defined(OS2) || defined(__HOS_AIX__))
178# define STDC
179#endif
180
181#if defined(__OS400__) && !defined(STDC) /* iSeries (formerly AS/400). */
182# define STDC
183#endif
184
185#ifndef STDC
186# ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */
187# define const /* note: need a more gentle solution here */
188# endif
189#endif
190
191/* Some Mac compilers merge all .h files incorrectly: */
192#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__)
193# define NO_DUMMY_DECL
194#endif
195
196/* Maximum value for memLevel in deflateInit2 */
197#ifndef MAX_MEM_LEVEL
198# ifdef MAXSEG_64K
199# define MAX_MEM_LEVEL 8
200# else
201# define MAX_MEM_LEVEL 9
202# endif
203#endif
204
205/* Maximum value for windowBits in deflateInit2 and inflateInit2.
206 * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files
207 * created by gzip. (Files created by minigzip can still be extracted by
208 * gzip.)
209 */
210#ifndef MAX_WBITS
211# define MAX_WBITS 15 /* 32K LZ77 window */
212#endif
213
214/* The memory requirements for deflate are (in bytes):
215 (1 << (windowBits+2)) + (1 << (memLevel+9))
216 that is: 128K for windowBits=15 + 128K for memLevel = 8 (default values)
217 plus a few kilobytes for small objects. For example, if you want to reduce
218 the default memory requirements from 256K to 128K, compile with
219 make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"
220 Of course this will generally degrade compression (there's no free lunch).
221
222 The memory requirements for inflate are (in bytes) 1 << windowBits
223 that is, 32K for windowBits=15 (default value) plus a few kilobytes
224 for small objects.
225*/
226
227 /* Type declarations */
228
229#ifndef OF /* function prototypes */
230# ifdef STDC
231# define OF(args) args
232# else
233# define OF(args) ()
234# endif
235#endif
236
237/* The following definitions for FAR are needed only for MSDOS mixed
238 * model programming (small or medium model with some far allocations).
239 * This was tested only with MSC; for other MSDOS compilers you may have
240 * to define NO_MEMCPY in zutil.h. If you don't need the mixed model,
241 * just define FAR to be empty.
242 */
243#ifdef SYS16BIT
244# if defined(M_I86SM) || defined(M_I86MM)
245 /* MSC small or medium model */
246# define SMALL_MEDIUM
247# ifdef _MSC_VER
248# define FAR _far
249# else
250# define FAR far
251# endif
252# endif
253# if (defined(__SMALL__) || defined(__MEDIUM__))
254 /* Turbo C small or medium model */
255# define SMALL_MEDIUM
256# ifdef __BORLANDC__
257# define FAR _far
258# else
259# define FAR far
260# endif
261# endif
262#endif
263
264#if defined(WINDOWS) || defined(WIN32)
265 /* If building or using zlib as a DLL, define ZLIB_DLL.
266 * This is not mandatory, but it offers a little performance increase.
267 */
268# ifdef ZLIB_DLL
269# if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500))
270# ifdef ZLIB_INTERNAL
271# define ZEXTERN extern __declspec(dllexport)
272# else
273# define ZEXTERN extern __declspec(dllimport)
274# endif
275# endif
276# endif /* ZLIB_DLL */
277 /* If building or using zlib with the WINAPI/WINAPIV calling convention,
278 * define ZLIB_WINAPI.
279 * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI.
280 */
281# ifdef ZLIB_WINAPI
282# ifdef FAR
283# undef FAR
284# endif
285# include <windows.h>
286 /* No need for _export, use ZLIB.DEF instead. */
287 /* For complete Windows compatibility, use WINAPI, not __stdcall. */
288# define ZEXPORT WINAPI
289# ifdef WIN32
290# define ZEXPORTVA WINAPIV
291# else
292# define ZEXPORTVA FAR CDECL
293# endif
294# endif
295#endif
296
297#if defined (__BEOS__)
298# ifdef ZLIB_DLL
299# ifdef ZLIB_INTERNAL
300# define ZEXPORT __declspec(dllexport)
301# define ZEXPORTVA __declspec(dllexport)
302# else
303# define ZEXPORT __declspec(dllimport)
304# define ZEXPORTVA __declspec(dllimport)
305# endif
306# endif
307#endif
308
309#ifdef HAVE_VISIBILITY_PRAGMA
310# define ZEXTERN __attribute__((visibility ("default"))) extern
311#endif
312
313#ifndef ZEXTERN
314# define ZEXTERN extern
315#endif
316#ifndef ZEXPORT
317# define ZEXPORT
318#endif
319#ifndef ZEXPORTVA
320# define ZEXPORTVA
321#endif
322
323#ifndef FAR
324# define FAR
325#endif
326
327#if !defined(__MACTYPES__)
328typedef unsigned char Byte; /* 8 bits */
329#endif
330typedef unsigned int uInt; /* 16 bits or more */
331typedef unsigned long uLong; /* 32 bits or more */
332
333#ifdef SMALL_MEDIUM
334 /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */
335# define Bytef Byte FAR
336#else
337 typedef Byte FAR Bytef;
338#endif
339typedef char FAR charf;
340typedef int FAR intf;
341typedef uInt FAR uIntf;
342typedef uLong FAR uLongf;
343
344#ifdef STDC
345 typedef void const *voidpc;
346 typedef void FAR *voidpf;
347 typedef void *voidp;
348#else
349 typedef Byte const *voidpc;
350 typedef Byte FAR *voidpf;
351 typedef Byte *voidp;
352#endif
353
354#if 0 /* HAVE_UNISTD_H -- this line is updated by ./configure */
355# include <sys/types.h> /* for off_t */
356# include <unistd.h> /* for SEEK_* and off_t */
357# ifdef VMS
358# include <unixio.h> /* for off_t */
359# endif
360# define z_off_t off_t
361#endif
362#ifndef SEEK_SET
363# define SEEK_SET 0 /* Seek from beginning of file. */
364# define SEEK_CUR 1 /* Seek from current position. */
365# define SEEK_END 2 /* Set file pointer to EOF plus "offset" */
366#endif
367#ifndef z_off_t
368# define z_off_t long
369#endif
370
371#if defined(__OS400__)
372# define NO_vsnprintf
373#endif
374
375#if defined(__MVS__)
376# define NO_vsnprintf
377#endif
378
379/* MVS linker does not support external names larger than 8 bytes */
380#if defined(__MVS__)
381# pragma map(deflateInit_,"DEIN")
382# pragma map(deflateInit2_,"DEIN2")
383# pragma map(deflateEnd,"DEEND")
384# pragma map(deflateBound,"DEBND")
385# pragma map(inflateInit_,"ININ")
386# pragma map(inflateInit2_,"ININ2")
387# pragma map(inflateEnd,"INEND")
388# pragma map(inflateSync,"INSY")
389# pragma map(inflateSetDictionary,"INSEDI")
390# pragma map(compressBound,"CMBND")
391# pragma map(inflate_table,"INTABL")
392# pragma map(inflate_fast,"INFA")
393# pragma map(inflate_copyright,"INCOPY")
394#endif
395
396#endif /* ZCONF_H */
diff --git a/zlib.3 b/zlib.3
index 5069b37..8d22c3f 100644
--- a/zlib.3
+++ b/zlib.3
@@ -1,4 +1,4 @@
1.TH ZLIB 3 "16 August 2006" 1.TH ZLIB 3 "xx August 2006"
2.SH NAME 2.SH NAME
3zlib \- compression/decompression library 3zlib \- compression/decompression library
4.SH SYNOPSIS 4.SH SYNOPSIS
@@ -133,7 +133,7 @@ before asking for help.
133Send questions and/or comments to zlib@gzip.org, 133Send questions and/or comments to zlib@gzip.org,
134or (for the Windows DLL version) to Gilles Vollant (info@winimage.com). 134or (for the Windows DLL version) to Gilles Vollant (info@winimage.com).
135.SH AUTHORS 135.SH AUTHORS
136Version 1.2.3.1 136Version 1.2.3.2
137Copyright (C) 1995-2005 Jean-loup Gailly (jloup@gzip.org) 137Copyright (C) 1995-2005 Jean-loup Gailly (jloup@gzip.org)
138and Mark Adler (madler@alumni.caltech.edu). 138and Mark Adler (madler@alumni.caltech.edu).
139.LP 139.LP
diff --git a/zlib.h b/zlib.h
index 20dbcd0..44ae5e9 100644
--- a/zlib.h
+++ b/zlib.h
@@ -1,5 +1,5 @@
1/* zlib.h -- interface of the 'zlib' general purpose compression library 1/* zlib.h -- interface of the 'zlib' general purpose compression library
2 version 1.2.3.1, August 16th, 2006 2 version 1.2.3.2, September 3rd, 2006
3 3
4 Copyright (C) 1995-2006 Jean-loup Gailly and Mark Adler 4 Copyright (C) 1995-2006 Jean-loup Gailly and Mark Adler
5 5
@@ -37,8 +37,8 @@
37extern "C" { 37extern "C" {
38#endif 38#endif
39 39
40#define ZLIB_VERSION "1.2.3.1" 40#define ZLIB_VERSION "1.2.3.2"
41#define ZLIB_VERNUM 0x1231 41#define ZLIB_VERNUM 0x1232
42#define ZLIB_VER_MAJOR 1 42#define ZLIB_VER_MAJOR 1
43#define ZLIB_VER_MINOR 2 43#define ZLIB_VER_MINOR 2
44#define ZLIB_VER_REVISION 3 44#define ZLIB_VER_REVISION 3
diff --git a/zlibdefs.h b/zlibdefs.h
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/zlibdefs.h
diff --git a/zutil.h b/zutil.h
index cddc4a7..3568c44 100644
--- a/zutil.h
+++ b/zutil.h
@@ -161,6 +161,12 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
161# endif 161# endif
162#endif 162#endif
163 163
164#if defined(__BORLANDC__)
165#pragma warn -8004
166#pragma warn -8008
167#pragma warn -8066
168#endif
169
164 /* common defaults */ 170 /* common defaults */
165 171
166#ifndef OS_CODE 172#ifndef OS_CODE
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-15 20:17:01 +0000