diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2015-03-16 16:32:23 +0000 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2015-03-16 16:32:23 +0000 |
| commit | ed339a8b358b0e4ec823e8de33d09eccce4b9e13 (patch) | |
| tree | f73e6d069adf10bda49905f0969c82e97b7ad873 /zlib/zutil.c | |
| parent | 251a6e2fdb031c1a7a626887adfdd19c6111092f (diff) | |
Update bundled zlib from 1.2.5 to 1.2.8 (latest version as of Mar 12, 2015).
Source: http://zlib.net/
Current release: zlib 1.2.8 April 28, 2013.
Update note: not all files included in zlib are also included in FLTK's
zlib version. However, there are only two files that are different from
the original zlib versions:
- zlib/CMakeLists.txt
- zlib/Makefile
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10624 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'zlib/zutil.c')
| -rw-r--r-- | zlib/zutil.c | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/zlib/zutil.c b/zlib/zutil.c index 898ed345b..23d2ebef0 100644 --- a/zlib/zutil.c +++ b/zlib/zutil.c @@ -1,17 +1,20 @@ /* zutil.c -- target dependent utility functions for the compression library - * Copyright (C) 1995-2005, 2010 Jean-loup Gailly. + * Copyright (C) 1995-2005, 2010, 2011, 2012 Jean-loup Gailly. * For conditions of distribution and use, see copyright notice in zlib.h */ /* @(#) $Id$ */ #include "zutil.h" +#ifndef Z_SOLO +# include "gzguts.h" +#endif #ifndef NO_DUMMY_DECL struct internal_state {int dummy;}; /* for buggy compilers */ #endif -const char * const z_errmsg[10] = { +z_const char * const z_errmsg[10] = { "need dictionary", /* Z_NEED_DICT 2 */ "stream end", /* Z_STREAM_END 1 */ "", /* Z_OK 0 */ @@ -85,27 +88,27 @@ uLong ZEXPORT zlibCompileFlags() #ifdef FASTEST flags += 1L << 21; #endif -#ifdef STDC +#if defined(STDC) || defined(Z_HAVE_STDARG_H) # ifdef NO_vsnprintf - flags += 1L << 25; + flags += 1L << 25; # ifdef HAS_vsprintf_void - flags += 1L << 26; + flags += 1L << 26; # endif # else # ifdef HAS_vsnprintf_void - flags += 1L << 26; + flags += 1L << 26; # endif # endif #else - flags += 1L << 24; + flags += 1L << 24; # ifdef NO_snprintf - flags += 1L << 25; + flags += 1L << 25; # ifdef HAS_sprintf_void - flags += 1L << 26; + flags += 1L << 26; # endif # else # ifdef HAS_snprintf_void - flags += 1L << 26; + flags += 1L << 26; # endif # endif #endif @@ -181,6 +184,7 @@ void ZLIB_INTERNAL zmemzero(dest, len) } #endif +#ifndef Z_SOLO #ifdef SYS16BIT @@ -316,3 +320,5 @@ void ZLIB_INTERNAL zcfree (opaque, ptr) } #endif /* MY_ZCALLOC */ + +#endif /* !Z_SOLO */ |