Skip to content

Commit 1b75786

Browse files
stammenstammen
committed
updated zlib builds. added missing zlib.dll for windows 8.1
1 parent 3f382a4 commit 1b75786

File tree

22 files changed

+788
-308
lines changed

22 files changed

+788
-308
lines changed

‎win10-specific/zlib/prebuilt/arm/zlib.dll

1 KB
Binary file not shown.

‎win10-specific/zlib/prebuilt/arm/zlib.lib

0 Bytes
Binary file not shown.

‎win10-specific/zlib/prebuilt/arm/zlibstatic.lib

132 KB
Binary file not shown.

‎win10-specific/zlib/prebuilt/win32/zlib.dll

1 KB
Binary file not shown.

‎win10-specific/zlib/prebuilt/win32/zlib.lib

0 Bytes
Binary file not shown.

‎win10-specific/zlib/prebuilt/win32/zlibstatic.lib

100 KB
Binary file not shown.

‎winrt_8.1-specific/zlib/include/zconf.h

Lines changed: 144 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
/* zconf.h -- configuration of the zlib compression library
2-
* Copyright (C) 1995-2010 Jean-loup Gailly.
2+
* Copyright (C) 1995-2013 Jean-loup Gailly.
33
* For conditions of distribution and use, see copyright notice in zlib.h
44
*/
55

66
/* @(#) $Id$ */
77

88
#ifndef ZCONF_H
99
#define ZCONF_H
10+
/* #undef Z_PREFIX */
11+
/* #undef Z_HAVE_UNISTD_H */
1012

1113
/*
1214
* If you *really* need a unique prefix for all types and library functions,
@@ -15,21 +17,25 @@
1517
* this permanently in zconf.h using "./configure --zprefix".
1618
*/
1719
#ifdef Z_PREFIX /* may be set to #if 1 by ./configure */
20+
# define Z_PREFIX_SET
1821

1922
/* all linked symbols */
2023
# define _dist_code z__dist_code
2124
# define _length_code z__length_code
2225
# define _tr_align z__tr_align
26+
# define _tr_flush_bits z__tr_flush_bits
2327
# define _tr_flush_block z__tr_flush_block
2428
# define _tr_init z__tr_init
2529
# define _tr_stored_block z__tr_stored_block
2630
# define _tr_tally z__tr_tally
2731
# define adler32 z_adler32
2832
# define adler32_combine z_adler32_combine
2933
# define adler32_combine64 z_adler32_combine64
30-
# define compress z_compress
31-
# define compress2 z_compress2
32-
# define compressBound z_compressBound
34+
# ifndef Z_SOLO
35+
# define compress z_compress
36+
# define compress2 z_compress2
37+
# define compressBound z_compressBound
38+
# endif
3339
# define crc32 z_crc32
3440
# define crc32_combine z_crc32_combine
3541
# define crc32_combine64 z_crc32_combine64
@@ -40,44 +46,53 @@
4046
# define deflateInit2_ z_deflateInit2_
4147
# define deflateInit_ z_deflateInit_
4248
# define deflateParams z_deflateParams
49+
# define deflatePending z_deflatePending
4350
# define deflatePrime z_deflatePrime
4451
# define deflateReset z_deflateReset
52+
# define deflateResetKeep z_deflateResetKeep
4553
# define deflateSetDictionary z_deflateSetDictionary
4654
# define deflateSetHeader z_deflateSetHeader
4755
# define deflateTune z_deflateTune
4856
# define deflate_copyright z_deflate_copyright
4957
# define get_crc_table z_get_crc_table
50-
# define gz_error z_gz_error
51-
# define gz_intmax z_gz_intmax
52-
# define gz_strwinerror z_gz_strwinerror
53-
# define gzbuffer z_gzbuffer
54-
# define gzclearerr z_gzclearerr
55-
# define gzclose z_gzclose
56-
# define gzclose_r z_gzclose_r
57-
# define gzclose_w z_gzclose_w
58-
# define gzdirect z_gzdirect
59-
# define gzdopen z_gzdopen
60-
# define gzeof z_gzeof
61-
# define gzerror z_gzerror
62-
# define gzflush z_gzflush
63-
# define gzgetc z_gzgetc
64-
# define gzgets z_gzgets
65-
# define gzoffset z_gzoffset
66-
# define gzoffset64 z_gzoffset64
67-
# define gzopen z_gzopen
68-
# define gzopen64 z_gzopen64
69-
# define gzprintf z_gzprintf
70-
# define gzputc z_gzputc
71-
# define gzputs z_gzputs
72-
# define gzread z_gzread
73-
# define gzrewind z_gzrewind
74-
# define gzseek z_gzseek
75-
# define gzseek64 z_gzseek64
76-
# define gzsetparams z_gzsetparams
77-
# define gztell z_gztell
78-
# define gztell64 z_gztell64
79-
# define gzungetc z_gzungetc
80-
# define gzwrite z_gzwrite
58+
# ifndef Z_SOLO
59+
# define gz_error z_gz_error
60+
# define gz_intmax z_gz_intmax
61+
# define gz_strwinerror z_gz_strwinerror
62+
# define gzbuffer z_gzbuffer
63+
# define gzclearerr z_gzclearerr
64+
# define gzclose z_gzclose
65+
# define gzclose_r z_gzclose_r
66+
# define gzclose_w z_gzclose_w
67+
# define gzdirect z_gzdirect
68+
# define gzdopen z_gzdopen
69+
# define gzeof z_gzeof
70+
# define gzerror z_gzerror
71+
# define gzflush z_gzflush
72+
# define gzgetc z_gzgetc
73+
# define gzgetc_ z_gzgetc_
74+
# define gzgets z_gzgets
75+
# define gzoffset z_gzoffset
76+
# define gzoffset64 z_gzoffset64
77+
# define gzopen z_gzopen
78+
# define gzopen64 z_gzopen64
79+
# ifdef _WIN32
80+
# define gzopen_w z_gzopen_w
81+
# endif
82+
# define gzprintf z_gzprintf
83+
# define gzvprintf z_gzvprintf
84+
# define gzputc z_gzputc
85+
# define gzputs z_gzputs
86+
# define gzread z_gzread
87+
# define gzrewind z_gzrewind
88+
# define gzseek z_gzseek
89+
# define gzseek64 z_gzseek64
90+
# define gzsetparams z_gzsetparams
91+
# define gztell z_gztell
92+
# define gztell64 z_gztell64
93+
# define gzungetc z_gzungetc
94+
# define gzwrite z_gzwrite
95+
# endif
8196
# define inflate z_inflate
8297
# define inflateBack z_inflateBack
8398
# define inflateBackEnd z_inflateBackEnd
@@ -92,16 +107,22 @@
92107
# define inflateReset z_inflateReset
93108
# define inflateReset2 z_inflateReset2
94109
# define inflateSetDictionary z_inflateSetDictionary
110+
# define inflateGetDictionary z_inflateGetDictionary
95111
# define inflateSync z_inflateSync
96112
# define inflateSyncPoint z_inflateSyncPoint
97113
# define inflateUndermine z_inflateUndermine
114+
# define inflateResetKeep z_inflateResetKeep
98115
# define inflate_copyright z_inflate_copyright
99116
# define inflate_fast z_inflate_fast
100117
# define inflate_table z_inflate_table
101-
# define uncompress z_uncompress
118+
# ifndef Z_SOLO
119+
# define uncompress z_uncompress
120+
# endif
102121
# define zError z_zError
103-
# define zcalloc z_zcalloc
104-
# define zcfree z_zcfree
122+
# ifndef Z_SOLO
123+
# define zcalloc z_zcalloc
124+
# define zcfree z_zcfree
125+
# endif
105126
# define zlibCompileFlags z_zlibCompileFlags
106127
# define zlibVersion z_zlibVersion
107128

@@ -111,7 +132,9 @@
111132
# define alloc_func z_alloc_func
112133
# define charf z_charf
113134
# define free_func z_free_func
114-
# define gzFile z_gzFile
135+
# ifndef Z_SOLO
136+
# define gzFile z_gzFile
137+
# endif
115138
# define gz_header z_gz_header
116139
# define gz_headerp z_gz_headerp
117140
# define in_func z_in_func
@@ -197,6 +220,12 @@
197220
# endif
198221
#endif
199222

223+
#if defined(ZLIB_CONST) && !defined(z_const)
224+
# define z_const const
225+
#else
226+
# define z_const
227+
#endif
228+
200229
/* Some Mac compilers merge all .h files incorrectly: */
201230
#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__)
202231
# define NO_DUMMY_DECL
@@ -243,6 +272,14 @@
243272
# endif
244273
#endif
245274

275+
#ifndef Z_ARG /* function prototypes for stdarg */
276+
# if defined(STDC) || defined(Z_HAVE_STDARG_H)
277+
# define Z_ARG(args) args
278+
# else
279+
# define Z_ARG(args) ()
280+
# endif
281+
#endif
282+
246283
/* The following definitions for FAR are needed only for MSDOS mixed
247284
* model programming (small or medium model with some far allocations).
248285
* This was tested only with MSC; for other MSDOS compilers you may have
@@ -356,12 +393,47 @@ typedef uLong FAR uLongf;
356393
typedef Byte *voidp;
357394
#endif
358395

396+
#if !defined(Z_U4) && !defined(Z_SOLO) && defined(STDC)
397+
# include <limits.h>
398+
# if (UINT_MAX == 0xffffffffUL)
399+
# define Z_U4 unsigned
400+
# elif (ULONG_MAX == 0xffffffffUL)
401+
# define Z_U4 unsigned long
402+
# elif (USHRT_MAX == 0xffffffffUL)
403+
# define Z_U4 unsigned short
404+
# endif
405+
#endif
406+
407+
#ifdef Z_U4
408+
typedef Z_U4 z_crc_t;
409+
#else
410+
typedef unsigned long z_crc_t;
411+
#endif
412+
359413
#ifdef HAVE_UNISTD_H /* may be set to #if 1 by ./configure */
360414
# define Z_HAVE_UNISTD_H
361415
#endif
362416

417+
#ifdef HAVE_STDARG_H /* may be set to #if 1 by ./configure */
418+
# define Z_HAVE_STDARG_H
419+
#endif
420+
363421
#ifdef STDC
364-
# include <sys/types.h> /* for off_t */
422+
# ifndef Z_SOLO
423+
# include <sys/types.h> /* for off_t */
424+
# endif
425+
#endif
426+
427+
#if defined(STDC) || defined(Z_HAVE_STDARG_H)
428+
# ifndef Z_SOLO
429+
# include <stdarg.h> /* for va_list */
430+
# endif
431+
#endif
432+
433+
#ifdef _WIN32
434+
# ifndef Z_SOLO
435+
# include <stddef.h> /* for wchar_t */
436+
# endif
365437
#endif
366438

367439
/* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and
@@ -370,21 +442,38 @@ typedef uLong FAR uLongf;
370442
* both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as
371443
* equivalently requesting no 64-bit operations
372444
*/
373-
#if -_LARGEFILE64_SOURCE - -1 == 1
445+
#if defined(_LARGEFILE64_SOURCE) && -_LARGEFILE64_SOURCE - -1 == 1
374446
# undef _LARGEFILE64_SOURCE
375447
#endif
376448

377-
#if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE)
378-
# include <unistd.h> /* for SEEK_* and off_t */
379-
# ifdef VMS
380-
# include <unixio.h> /* for off_t */
381-
# endif
382-
# ifndef z_off_t
383-
# define z_off_t off_t
449+
#if defined(__WATCOMC__) && !defined(Z_HAVE_UNISTD_H)
450+
# define Z_HAVE_UNISTD_H
451+
#endif
452+
#ifndef Z_SOLO
453+
# if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE)
454+
# include <unistd.h> /* for SEEK_*, off_t, and _LFS64_LARGEFILE */
455+
# ifdef VMS
456+
# include <unixio.h> /* for off_t */
457+
# endif
458+
# ifndef z_off_t
459+
# define z_off_t off_t
460+
# endif
384461
# endif
385462
#endif
386463

387-
#ifndef SEEK_SET
464+
#if defined(_LFS64_LARGEFILE) && _LFS64_LARGEFILE-0
465+
# define Z_LFS64
466+
#endif
467+
468+
#if defined(_LARGEFILE64_SOURCE) && defined(Z_LFS64)
469+
# define Z_LARGE64
470+
#endif
471+
472+
#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS-0 == 64 && defined(Z_LFS64)
473+
# define Z_WANT64
474+
#endif
475+
476+
#if !defined(SEEK_SET) && !defined(Z_SOLO)
388477
# define SEEK_SET 0 /* Seek from beginning of file. */
389478
# define SEEK_CUR 1 /* Seek from current position. */
390479
# define SEEK_END 2 /* Set file pointer to EOF plus "offset" */
@@ -394,18 +483,14 @@ typedef uLong FAR uLongf;
394483
# define z_off_t long
395484
#endif
396485

397-
#if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0
486+
#if !defined(_WIN32) && defined(Z_LARGE64)
398487
# define z_off64_t off64_t
399488
#else
400-
# define z_off64_t z_off_t
401-
#endif
402-
403-
#if defined(__OS400__)
404-
# define NO_vsnprintf
405-
#endif
406-
407-
#if defined(__MVS__)
408-
# define NO_vsnprintf
489+
# if defined(_WIN32) && !defined(__GNUC__) && !defined(Z_SOLO)
490+
# define z_off64_t __int64
491+
# else
492+
# define z_off64_t z_off_t
493+
# endif
409494
#endif
410495

411496
/* MVS linker does not support external names larger than 8 bytes */

0 commit comments

Comments
 (0)