diff options
| author | doko <doko@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-11-16 18:35:05 +0000 |
|---|---|---|
| committer | doko <doko@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-11-16 18:35:05 +0000 |
| commit | 75e1829ff65760cfd66aa678dfc6fc0e42431958 (patch) | |
| tree | 134aeb9aadb88e8719595edaaa40522b99d2a56a /zlib/zutil.c | |
| parent | 0ed3336a547e85306b4424b97b9762dbe15db061 (diff) | |
| download | gcc-75e1829ff65760cfd66aa678dfc6fc0e42431958.tar.gz | |
2012-11-16 Matthias Klose <doko@ubuntu.com>
* Imported zlib 1.2.7; merged local changes.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@193574 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'zlib/zutil.c')
| -rw-r--r-- | zlib/zutil.c | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/zlib/zutil.c b/zlib/zutil.c index cea4a311c3f..e1e463fa960 100644 --- a/zlib/zutil.c +++ b/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: zutil.c,v 1.1.1.2 2002/03/11 21:53:27 tromey Exp $ */ #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 */ |