diff options
| author | Carlos Martín Nieto <cmn@dwim.me> | 2014-06-11 16:36:34 +0200 |
|---|---|---|
| committer | Carlos Martín Nieto <cmn@dwim.me> | 2014-06-11 16:36:34 +0200 |
| commit | bb54fad0452fbcc876c4cfcb42f4590a2cb23be6 (patch) | |
| tree | 1d357b0baf9652c1b35dbacef6c11bb81a1107e3 /deps/zlib/zutil.c | |
| parent | 7064cdafbd25f66de016467b381d9f4474fba40a (diff) | |
| parent | 7cead31eddd36b6fd5ed6f166f64eb2a15aa23e7 (diff) | |
| download | libgit2-bb54fad0452fbcc876c4cfcb42f4590a2cb23be6.tar.gz | |
Merge branch 'cmn/zlib-update' into cmn/update-zlib
Diffstat (limited to 'deps/zlib/zutil.c')
| -rw-r--r-- | deps/zlib/zutil.c | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/deps/zlib/zutil.c b/deps/zlib/zutil.c index 898ed345b..23d2ebef0 100644 --- a/deps/zlib/zutil.c +++ b/deps/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 */ |