| zutil.c (230837) | zutil.c (237248) |
|---|---|
| 1/* zutil.c -- target dependent utility functions for the compression library | 1/* zutil.c -- target dependent utility functions for the compression library |
| 2 * Copyright (C) 1995-2005, 2010, 2011 Jean-loup Gailly. | 2 * Copyright (C) 1995-2005, 2010, 2011, 2012 Jean-loup Gailly. |
| 3 * For conditions of distribution and use, see copyright notice in zlib.h 4 */ 5 6/* @(#) $Id$ */ 7 8#include "zutil.h" | 3 * For conditions of distribution and use, see copyright notice in zlib.h 4 */ 5 6/* @(#) $Id$ */ 7 8#include "zutil.h" |
| 9#ifndef Z_SOLO 10# include "gzguts.h" 11#endif |
|
| 9 10#ifndef NO_DUMMY_DECL 11struct internal_state {int dummy;}; /* for buggy compilers */ 12#endif 13 14const char * const z_errmsg[10] = { 15"need dictionary", /* Z_NEED_DICT 2 */ 16"stream end", /* Z_STREAM_END 1 */ --- 63 unchanged lines hidden (view full) --- 80 flags += 1L << 17; 81#endif 82#ifdef PKZIP_BUG_WORKAROUND 83 flags += 1L << 20; 84#endif 85#ifdef FASTEST 86 flags += 1L << 21; 87#endif | 12 13#ifndef NO_DUMMY_DECL 14struct internal_state {int dummy;}; /* for buggy compilers */ 15#endif 16 17const char * const z_errmsg[10] = { 18"need dictionary", /* Z_NEED_DICT 2 */ 19"stream end", /* Z_STREAM_END 1 */ --- 63 unchanged lines hidden (view full) --- 83 flags += 1L << 17; 84#endif 85#ifdef PKZIP_BUG_WORKAROUND 86 flags += 1L << 20; 87#endif 88#ifdef FASTEST 89 flags += 1L << 21; 90#endif |
| 88#ifdef Z_SOLO 89 return flags; | 91#if defined(STDC) || defined(Z_HAVE_STDARG_H) 92# ifdef NO_vsnprintf 93 flags += 1L << 25; 94# ifdef HAS_vsprintf_void 95 flags += 1L << 26; 96# endif 97# else 98# ifdef HAS_vsnprintf_void 99 flags += 1L << 26; 100# endif 101# endif |
| 90#else | 102#else |
| 91 return flags + gzflags(); | 103 flags += 1L << 24; 104# ifdef NO_snprintf 105 flags += 1L << 25; 106# ifdef HAS_sprintf_void 107 flags += 1L << 26; 108# endif 109# else 110# ifdef HAS_snprintf_void 111 flags += 1L << 26; 112# endif 113# endif |
| 92#endif | 114#endif |
| 115 return flags; |
|
| 93} 94 95#ifdef DEBUG 96 97# ifndef verbose 98# define verbose 0 99# endif 100int ZLIB_INTERNAL z_verbose = verbose; --- 201 unchanged lines hidden --- | 116} 117 118#ifdef DEBUG 119 120# ifndef verbose 121# define verbose 0 122# endif 123int ZLIB_INTERNAL z_verbose = verbose; --- 201 unchanged lines hidden --- |