diff options
| author | Nay <dnpd.dd@gmail.com> | 2012-09-03 16:11:46 +0100 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2012-09-03 16:11:46 +0100 |
| commit | 874ddcb0aede1fb8a3d8077bc11f08203e80b6ba (patch) | |
| tree | 78ec500df7858b45ed4c64d05ef135eaffa400f2 /dep/zlib/zutil.c | |
| parent | dba602ea1617c42c95fa9703d53f4af0a2b3f35d (diff) | |
| parent | 0db5573d4de436cf14c9f6d113a28800fa278c2c (diff) | |
Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
dep/PackageList.txt
src/tools/map_extractor/System.cpp
Diffstat (limited to 'dep/zlib/zutil.c')
| -rw-r--r-- | dep/zlib/zutil.c | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/dep/zlib/zutil.c b/dep/zlib/zutil.c index 898ed345b0e..65e0d3b72b0 100644 --- a/dep/zlib/zutil.c +++ b/dep/zlib/zutil.c @@ -1,11 +1,14 @@ /* 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 */ @@ -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 */ |