diff options
| author | des <des@FreeBSD.org> | 2006-03-23 14:09:21 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2006-03-23 14:09:21 +0000 |
| commit | ec17f7788515f838ae8c595748fbd664f1e2f1f1 (patch) | |
| tree | 297104a1ee790469dfe9ff88a857a9836926bccc /lib/libz/zutil.c | |
| parent | 6d9b0264a175d883795d7a2549ca6f2d9c2a15b7 (diff) | |
| download | FreeBSD-src-ec17f7788515f838ae8c595748fbd664f1e2f1f1.zip FreeBSD-src-ec17f7788515f838ae8c595748fbd664f1e2f1f1.tar.gz | |
Resolve conflicts.
Diffstat (limited to 'lib/libz/zutil.c')
| -rw-r--r-- | lib/libz/zutil.c | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/lib/libz/zutil.c b/lib/libz/zutil.c index 0ef4f99..d55f594 100644 --- a/lib/libz/zutil.c +++ b/lib/libz/zutil.c @@ -1,5 +1,5 @@ /* zutil.c -- target dependent utility functions for the compression library - * Copyright (C) 1995-2003 Jean-loup Gailly. + * Copyright (C) 1995-2005 Jean-loup Gailly. * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -11,10 +11,6 @@ struct internal_state {int dummy;}; /* for buggy compilers */ #endif -#ifndef STDC -extern void exit OF((int)); -#endif - const char * const z_errmsg[10] = { "need dictionary", /* Z_NEED_DICT 2 */ "stream end", /* Z_STREAM_END 1 */ @@ -78,38 +74,38 @@ uLong ZEXPORT zlibCompileFlags() flags += 1 << 13; #endif #ifdef NO_GZCOMPRESS - flags += 1 << 16; + flags += 1L << 16; #endif #ifdef NO_GZIP - flags += 1 << 17; + flags += 1L << 17; #endif #ifdef PKZIP_BUG_WORKAROUND - flags += 1 << 20; + flags += 1L << 20; #endif #ifdef FASTEST - flags += 1 << 21; + flags += 1L << 21; #endif #ifdef STDC # ifdef NO_vsnprintf - flags += 1 << 25; + flags += 1L << 25; # ifdef HAS_vsprintf_void - flags += 1 << 26; + flags += 1L << 26; # endif # else # ifdef HAS_vsnprintf_void - flags += 1 << 26; + flags += 1L << 26; # endif # endif #else - flags += 1 << 24; + flags += 1L << 24; # ifdef NO_snprintf - flags += 1 << 25; + flags += 1L << 25; # ifdef HAS_sprintf_void - flags += 1 << 26; + flags += 1L << 26; # endif # else # ifdef HAS_snprintf_void - flags += 1 << 26; + flags += 1L << 26; # endif # endif #endif @@ -141,7 +137,10 @@ const char * ZEXPORT zError(err) } #if defined(_WIN32_WCE) - /* does not exist on WCE */ + /* The Microsoft C Run-Time Library for Windows CE doesn't have + * errno. We define it as a global variable to simplify porting. + * Its value is always 0 and should not be used. + */ int errno = 0; #endif |
