diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-02-03 23:33:16 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-02-03 23:33:16 (GMT) |
| commit | 9a5675d33fed114eab1c0c2db4d70ff4b85ea597 (patch) | |
| tree | c6f8a5a12c00a3394a7a79fa2be6a4ecf065beed /compat/zlib/zutil.c | |
| parent | 1b8b1325832f5d25e6db0c5b7839dada981562f5 (diff) | |
| download | tcl-zlib_1_2_6.zip tcl-zlib_1_2_6.tar.gz tcl-zlib_1_2_6.tar.bz2 | |
[Frq 3483854] zlib-1.2.6zlib_1_2_6
Not to be merged to trunk until the official zlib1.dll is
released as well!!!
Diffstat (limited to 'compat/zlib/zutil.c')
| -rw-r--r-- | compat/zlib/zutil.c | 33 |
1 files changed, 8 insertions, 25 deletions
diff --git a/compat/zlib/zutil.c b/compat/zlib/zutil.c index 7a55c44..2bae6e3 100644 --- a/compat/zlib/zutil.c +++ b/compat/zlib/zutil.c @@ -1,9 +1,9 @@ /* zutil.c -- target dependent utility functions for the compression library - * Copyright (C) 1995-2005, 2010 Jean-loup Gailly. + * Copyright (C) 1995-2005, 2010, 2011 Jean-loup Gailly. * For conditions of distribution and use, see copyright notice in zlib.h */ -/* @(#) $Id: zutil.c,v 1.3 2010/04/20 14:50:10 nijtmans Exp $ */ +/* @(#) $Id$ */ #include "zutil.h" @@ -85,31 +85,11 @@ uLong ZEXPORT zlibCompileFlags() #ifdef FASTEST flags += 1L << 21; #endif -#ifdef STDC -# ifdef NO_vsnprintf - flags += 1L << 25; -# ifdef HAS_vsprintf_void - flags += 1L << 26; -# endif -# else -# ifdef HAS_vsnprintf_void - flags += 1L << 26; -# endif -# endif +#ifdef Z_SOLO + return flags; #else - flags += 1L << 24; -# ifdef NO_snprintf - flags += 1L << 25; -# ifdef HAS_sprintf_void - flags += 1L << 26; -# endif -# else -# ifdef HAS_snprintf_void - flags += 1L << 26; -# endif -# endif -#endif return flags; +#endif } #ifdef DEBUG @@ -181,6 +161,7 @@ void ZLIB_INTERNAL zmemzero(dest, len) } #endif +#ifndef Z_SOLO #ifdef SYS16BIT @@ -316,3 +297,5 @@ void ZLIB_INTERNAL zcfree (opaque, ptr) } #endif /* MY_ZCALLOC */ + +#endif /* !Z_SOLO */ |