aboutsummaryrefslogtreecommitdiff
path: root/zlib
diff options
context:
space:
mode:
Diffstat (limited to 'zlib')
-rw-r--r--zlib/Makefile11
-rwxr-xr-x[-rw-r--r--]zlib/contrib/masmx64/bld_ml64.bat0
-rwxr-xr-x[-rw-r--r--]zlib/contrib/masmx86/bld_ml32.bat0
-rw-r--r--zlib/crc32.c2
-rw-r--r--zlib/deflate.c2
-rw-r--r--zlib/gzlib.c14
-rw-r--r--zlib/infback.c1
-rw-r--r--zlib/inffast.c1
-rw-r--r--zlib/inflate.c2
-rw-r--r--zlib/inftrees.c1
-rw-r--r--zlib/trees.c2
-rw-r--r--zlib/win32/zlib.def85
-rw-r--r--zlib/zutil.c2
13 files changed, 28 insertions, 95 deletions
diff --git a/zlib/Makefile b/zlib/Makefile
index 6bba86c73..69371a621 100644
--- a/zlib/Makefile
+++ b/zlib/Makefile
@@ -1,5 +1,8 @@
-all:
- -@echo "Please use ./configure first. Thank you."
+SHAREDLIB=zlib1
+DEFFILE = win32\zlib.def
+DEFINES += ZLIB_DLL
+
+CSRCS = adler32.c compress.c crc32.c uncompr.c deflate.c trees.c \
+ zutil.c inflate.c infback.c inftrees.c inffast.c gzlib.c \
+ gzclose.c gzread.c gzwrite.c
-distclean:
- make -f Makefile.in distclean
diff --git a/zlib/contrib/masmx64/bld_ml64.bat b/zlib/contrib/masmx64/bld_ml64.bat
index 8f9343d0a..8f9343d0a 100644..100755
--- a/zlib/contrib/masmx64/bld_ml64.bat
+++ b/zlib/contrib/masmx64/bld_ml64.bat
diff --git a/zlib/contrib/masmx86/bld_ml32.bat b/zlib/contrib/masmx86/bld_ml32.bat
index e1b86bf68..e1b86bf68 100644..100755
--- a/zlib/contrib/masmx86/bld_ml32.bat
+++ b/zlib/contrib/masmx86/bld_ml32.bat
diff --git a/zlib/crc32.c b/zlib/crc32.c
index 979a7190a..a9d79b8ff 100644
--- a/zlib/crc32.c
+++ b/zlib/crc32.c
@@ -21,6 +21,8 @@
DYNAMIC_CRC_TABLE and MAKECRCH can be #defined to write out crc32.h.
*/
+#include <stdio.h>
+
#ifdef MAKECRCH
# include <stdio.h>
# ifndef DYNAMIC_CRC_TABLE
diff --git a/zlib/deflate.c b/zlib/deflate.c
index 696957705..4d709322e 100644
--- a/zlib/deflate.c
+++ b/zlib/deflate.c
@@ -49,6 +49,8 @@
/* @(#) $Id$ */
+#include <stdio.h>
+
#include "deflate.h"
const char deflate_copyright[] =
diff --git a/zlib/gzlib.c b/zlib/gzlib.c
index fae202ef8..1819af951 100644
--- a/zlib/gzlib.c
+++ b/zlib/gzlib.c
@@ -99,7 +99,7 @@ local gzFile gz_open(path, fd, mode)
#ifdef O_CLOEXEC
int cloexec = 0;
#endif
-#ifdef O_EXCL
+#ifdef _O_EXCL
int exclusive = 0;
#endif
@@ -228,14 +228,14 @@ local gzFile gz_open(path, fd, mode)
(cloexec ? O_CLOEXEC : 0) |
#endif
(state->mode == GZ_READ ?
- O_RDONLY :
- (O_WRONLY | O_CREAT |
-#ifdef O_EXCL
- (exclusive ? O_EXCL : 0) |
+ _O_RDONLY :
+ (_O_WRONLY | _O_CREAT |
+#ifdef _O_EXCL
+ (exclusive ? _O_EXCL : 0) |
#endif
(state->mode == GZ_WRITE ?
- O_TRUNC :
- O_APPEND)));
+ _O_TRUNC :
+ _O_APPEND)));
/* open the file with the appropriate flags (or just use fd) */
state->fd = fd > -1 ? fd : (
diff --git a/zlib/infback.c b/zlib/infback.c
index f3833c2e4..b0ff94bb6 100644
--- a/zlib/infback.c
+++ b/zlib/infback.c
@@ -10,6 +10,7 @@
inflate_fast() can be used with either inflate.c or infback.c.
*/
+#include <stdio.h>
#include "zutil.h"
#include "inftrees.h"
#include "inflate.h"
diff --git a/zlib/inffast.c b/zlib/inffast.c
index bda59ceb6..a2e4fad43 100644
--- a/zlib/inffast.c
+++ b/zlib/inffast.c
@@ -3,6 +3,7 @@
* For conditions of distribution and use, see copyright notice in zlib.h
*/
+#include <stdio.h>
#include "zutil.h"
#include "inftrees.h"
#include "inflate.h"
diff --git a/zlib/inflate.c b/zlib/inflate.c
index 870f89bb4..cb4cb8675 100644
--- a/zlib/inflate.c
+++ b/zlib/inflate.c
@@ -80,6 +80,8 @@
* The history for versions after 1.2.0 are in ChangeLog in zlib distribution.
*/
+#include <stdio.h>
+
#include "zutil.h"
#include "inftrees.h"
#include "inflate.h"
diff --git a/zlib/inftrees.c b/zlib/inftrees.c
index 44d89cf24..4ccc909e0 100644
--- a/zlib/inftrees.c
+++ b/zlib/inftrees.c
@@ -3,6 +3,7 @@
* For conditions of distribution and use, see copyright notice in zlib.h
*/
+#include <stdio.h>
#include "zutil.h"
#include "inftrees.h"
diff --git a/zlib/trees.c b/zlib/trees.c
index 1fd7759ef..5e19f2630 100644
--- a/zlib/trees.c
+++ b/zlib/trees.c
@@ -34,6 +34,8 @@
/* #define GEN_TREES_H */
+#include <stdio.h>
+
#include "deflate.h"
#ifdef DEBUG
diff --git a/zlib/win32/zlib.def b/zlib/win32/zlib.def
index face65518..e18a5e0ca 100644
--- a/zlib/win32/zlib.def
+++ b/zlib/win32/zlib.def
@@ -1,86 +1,3 @@
; zlib data compression library
EXPORTS
-; basic functions
- zlibVersion
- deflate
- deflateEnd
- inflate
- inflateEnd
-; advanced functions
- deflateSetDictionary
- deflateCopy
- deflateReset
- deflateParams
- deflateTune
- deflateBound
- deflatePending
- deflatePrime
- deflateSetHeader
- inflateSetDictionary
- inflateGetDictionary
- inflateSync
- inflateCopy
- inflateReset
- inflateReset2
- inflatePrime
- inflateMark
- inflateGetHeader
- inflateBack
- inflateBackEnd
- zlibCompileFlags
-; utility functions
- compress
- compress2
- compressBound
- uncompress
- gzopen
- gzdopen
- gzbuffer
- gzsetparams
- gzread
- gzwrite
- gzprintf
- gzvprintf
- gzputs
- gzgets
- gzputc
- gzgetc
- gzungetc
- gzflush
- gzseek
- gzrewind
- gztell
- gzoffset
- gzeof
- gzdirect
- gzclose
- gzclose_r
- gzclose_w
- gzerror
- gzclearerr
-; large file functions
- gzopen64
- gzseek64
- gztell64
- gzoffset64
- adler32_combine64
- crc32_combine64
-; checksum functions
- adler32
- crc32
- adler32_combine
- crc32_combine
-; various hacks, don't look :)
- deflateInit_
- deflateInit2_
- inflateInit_
- inflateInit2_
- inflateBackInit_
- gzgetc_
- zError
- inflateSyncPoint
- get_crc_table
- inflateUndermine
- inflateResetKeep
- deflateResetKeep
- gzopen_w
+
diff --git a/zlib/zutil.c b/zlib/zutil.c
index 23d2ebef0..daa8633c6 100644
--- a/zlib/zutil.c
+++ b/zlib/zutil.c
@@ -5,6 +5,8 @@
/* @(#) $Id$ */
+#include <stdio.h>
+
#include "zutil.h"
#ifndef Z_SOLO
# include "gzguts.h"