zlib 1.0.7v1.0.7

8 files changed, 83 insertions, 19 deletions

diff --git a/Makefile.b32 b/msdos/Makefile.b32
index fc3ac68..fc3ac68 100644
--- a/Makefile.b32
+++ b/msdos/Makefile.b32
diff --git a/Makefile.bor b/msdos/Makefile.bor
index 2116563..2116563 100644
--- a/Makefile.bor
+++ b/msdos/Makefile.bor
diff --git a/Makefile.dj2 b/msdos/Makefile.dj2
index 398f28b..0ab431c 100644
--- a/Makefile.dj2
+++ b/msdos/Makefile.dj2
@@ -1,5 +1,5 @@
 # Makefile for zlib.  Modified for djgpp v2.0 by F. J. Donahoe, 3/15/96.
-# Copyright (C) 1995-1996 Jean-loup Gailly.
+# Copyright (C) 1995-1998 Jean-loup Gailly.
 # For conditions of distribution and use, see copyright notice in zlib.h 
 
 # To compile, or to compile and test, type:
@@ -22,7 +22,8 @@
 # - - - - -
 # Alternately, these variables may be defined below, overriding the values
 # in djgpp.env, as
-INCLUDE_PATH=c:\usr\include
+# INCLUDE_PATH=c:\usr\include
+# LIBRARY_PATH=c:\usr\lib
 
 CC=gcc
 
@@ -32,12 +33,12 @@ CC=gcc
 CFLAGS=-MMD -O3 $(BUTT) -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
              -Wstrict-prototypes -Wmissing-prototypes
 
-# If cp.exe is not found, replace with copy /Y .
-CP=cp -f
-# If install.exe is not found, replace with $(CP).
-INSTALL=install
-# The default value of RM is "rm -f."  If "rm.exe" is not found, uncomment:
-# RM=del
+# If cp.exe is available, replace "copy /Y" with "cp -fp" .
+CP=copy /Y
+# If gnu install.exe is available, replace $(CP) with ginstall.
+INSTALL=$(CP)
+# The default value of RM is "rm -f."  If "rm.exe" is found, comment out:
+RM=del
 LDLIBS=-L. -lz
 LD=$(CC) -s -o
 LDSHARED=$(CC)
@@ -77,15 +78,21 @@ libz.a: $(OBJS)
 install: $(INCL) $(LIBS)
         -@if not exist $(INCLUDE_PATH)\nul mkdir $(INCLUDE_PATH)
         -@if not exist $(LIBRARY_PATH)\nul mkdir $(LIBRARY_PATH)
-        for %%f in ($(INCL)) do $(INSTALL) %%f $(INCLUDE_PATH)
-        for %%p in ($(LIBS)) do $(INSTALL) %%p $(LIBRARY_PATH)
+        $(INSTALL) zlib.h $(INCLUDE_PATH)
+        $(INSTALL) zconf.h $(INCLUDE_PATH)
+        $(INSTALL) libz.a $(LIBRARY_PATH)
 
 uninstall:
-        for %%f in ($(INCL)) do $(RM) $(INCLUDE_PATH)\%%f
-        for %%p in ($(LIBS)) do $(RM) $(LIBRARY_PATH)\%%p
+        $(RM) $(INCLUDE_PATH)\zlib.h
+        $(RM) $(INCLUDE_PATH)\zconf.h
+        $(RM) $(LIBRARY_PATH)\libz.a
 
 clean:
-        for %%p in (*.d *.o *.exe libz.a libz.so* foo.gz) do $(RM) %%p
+        $(RM) *.d
+        $(RM) *.o
+        $(RM) *.exe
+        $(RM) libz.a
+        $(RM) foo.gz
 
 DEPS := $(wildcard *.d)
 ifneq ($(DEPS),)
diff --git a/Makefile.msc b/msdos/Makefile.msc
index 112684a..1a6d663 100644
--- a/Makefile.msc
+++ b/msdos/Makefile.msc
@@ -15,7 +15,7 @@ CFLAGS=-Oait -Gs -nologo -W3 $(MODEL)
 #-Ox generates bad code with MSC 5.1
 CC=cl
 LD=link
-LDFLAGS=/e/st:0x1000/noe
+LDFLAGS=/e/st:0x1500/noe
 O=.obj
 
 # variables
diff --git a/Makefile.tc b/msdos/Makefile.tc
index a46ce73..a46ce73 100644
--- a/Makefile.tc
+++ b/msdos/Makefile.tc
diff --git a/Makefile.wat b/msdos/Makefile.wat
index 2a3b629..2a3b629 100644
--- a/Makefile.wat
+++ b/msdos/Makefile.wat
diff --git a/msdos/zlib.def b/msdos/zlib.def
new file mode 100644
index 0000000..346cce7
--- /dev/null
+++ b/msdos/zlib.def
@@ -0,0 +1,57 @@
+LIBRARY         "zlib"
+
+DESCRIPTION     '"""zlib data compression library"""'
+
+EXETYPE         NT
+
+SUBSYSTEM       WINDOWS
+
+STUB            'WINSTUB.EXE'
+
+VERSION         1.07
+
+CODE             EXECUTE READ
+
+DATA             READ WRITE
+
+HEAPSIZE        1048576,4096
+
+EXPORTS
+    adler32                        @1
+    compress                       @2
+    crc32                          @3
+    deflate                        @4
+    deflateCopy                    @5
+    deflateEnd                     @6
+    deflateInit2_                  @7
+    deflateInit_                   @8
+    deflateParams                  @9
+    deflateReset                   @10
+    deflateSetDictionary           @11
+    gzclose                        @12
+    gzdopen                        @13
+    gzerror                        @14
+    gzflush                        @15
+    gzopen                         @16
+    gzread                         @17
+    gzwrite                        @18
+    inflate                        @19
+    inflateEnd                     @20
+    inflateInit2_                  @21
+    inflateInit_                   @22
+    inflateReset                   @23
+    inflateSetDictionary           @24
+    inflateSync                    @25
+    uncompress                     @26
+    zlibVersion                    @27
+    gzprintf                       @28
+    gzputc                         @29
+    gzgetc                         @30
+    gzseek                         @31
+    gzrewind                       @32
+    gztell                         @33
+    gzeof                          @34
+    gzsetparams                    @35
+    zError                         @36
+    inflateSyncPoint               @37
+    get_crc_table                  @38
diff --git a/zlib.rc b/msdos/zlib.rc
index 4c67aff..a5a9fcb 100644
--- a/zlib.rc
+++ b/msdos/zlib.rc
@@ -2,8 +2,8 @@
 
 #define IDR_VERSION1  1
 IDR_VERSION1    VERSIONINFO     MOVEABLE IMPURE LOADONCALL DISCARDABLE
-  FILEVERSION    1,0,5,0
-  PRODUCTVERSION 1,0,5,0
+  FILEVERSION    1,0,7,0
+  PRODUCTVERSION 1,0,7,0
   FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
   FILEFLAGS     0
   FILEOS        VOS_DOS_WINDOWS32
@@ -17,12 +17,12 @@ BEGIN
 
     BEGIN
       VALUE "FileDescription", "zlib data compression library\0"
-      VALUE "FileVersion",      "1.0.5\0"
+      VALUE "FileVersion",      "1.0.7\0"
       VALUE "InternalName",     "zlib\0"
       VALUE "OriginalFilename", "zlib.lib\0"
       VALUE "ProductName",      "ZLib.DLL\0"
-      VALUE "Comments", "DLL support by Alessandro Iacopetti\0"
-      VALUE "LegalCopyright", "(C) 1995-1996 Jean-loup Gailly & Mark Adler\0"
+      VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
+      VALUE "LegalCopyright", "(C) 1995-1998 Jean-loup Gailly & Mark Adler\0"
     END
   END
   BLOCK "VarFileInfo"