diff options
| author | cedeel@gmail.com <cedeel@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-06-04 01:35:17 +0200 |
|---|---|---|
| committer | cedeel@gmail.com <cedeel@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-06-04 01:35:17 +0200 |
| commit | b17d12c86f3e7414673d653396d2dce2e862b1e3 (patch) | |
| tree | 95225ff23d64c0ea4a621401b841efe55b5a6169 /zlib-1.2.7/zutil.c | |
| parent | Added planks into items.ini (diff) | |
| download | cuberite-b17d12c86f3e7414673d653396d2dce2e862b1e3.tar cuberite-b17d12c86f3e7414673d653396d2dce2e862b1e3.tar.gz cuberite-b17d12c86f3e7414673d653396d2dce2e862b1e3.tar.bz2 cuberite-b17d12c86f3e7414673d653396d2dce2e862b1e3.tar.lz cuberite-b17d12c86f3e7414673d653396d2dce2e862b1e3.tar.xz cuberite-b17d12c86f3e7414673d653396d2dce2e862b1e3.tar.zst cuberite-b17d12c86f3e7414673d653396d2dce2e862b1e3.zip | |
Diffstat (limited to '')
| -rw-r--r-- | zlib-1.2.7/zutil.c (renamed from zlib-1.2.5/zutil.c) | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/zlib-1.2.5/zutil.c b/zlib-1.2.7/zutil.c index 898ed345b..65e0d3b72 100644 --- a/zlib-1.2.5/zutil.c +++ b/zlib-1.2.7/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 */ |