projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Minor fix to wxGraphicsContext::SetInterpolationQuality() in wxMSW.
[wxWidgets.git]
/
src
/
zlib
/
zutil.c
diff --git
a/src/zlib/zutil.c
b/src/zlib/zutil.c
index 0ef4f99f57ebd5e1c527e8b196f81c3bb32cfa77..d55f5948a37f181c003dd4572b660727132eaba1 100644
(file)
--- a/
src/zlib/zutil.c
+++ b/
src/zlib/zutil.c
@@
-1,5
+1,5
@@
/* zutil.c -- target dependent utility functions for the compression library
/* zutil.c -- target dependent utility functions for the compression library
- * Copyright (C) 1995-200
3
Jean-loup Gailly.
+ * Copyright (C) 1995-200
5
Jean-loup Gailly.
* For conditions of distribution and use, see copyright notice in zlib.h
*/
* 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
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 */
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 << 13;
#endif
#ifdef NO_GZCOMPRESS
- flags += 1 << 16;
+ flags += 1
L
<< 16;
#endif
#ifdef NO_GZIP
#endif
#ifdef NO_GZIP
- flags += 1 << 17;
+ flags += 1
L
<< 17;
#endif
#ifdef PKZIP_BUG_WORKAROUND
#endif
#ifdef PKZIP_BUG_WORKAROUND
- flags += 1 << 20;
+ flags += 1
L
<< 20;
#endif
#ifdef FASTEST
#endif
#ifdef FASTEST
- flags += 1 << 21;
+ flags += 1
L
<< 21;
#endif
#ifdef STDC
# ifdef NO_vsnprintf
#endif
#ifdef STDC
# ifdef NO_vsnprintf
- flags += 1 << 25;
+ flags += 1
L
<< 25;
# ifdef HAS_vsprintf_void
# ifdef HAS_vsprintf_void
- flags += 1 << 26;
+ flags += 1
L
<< 26;
# endif
# else
# ifdef HAS_vsnprintf_void
# endif
# else
# ifdef HAS_vsnprintf_void
- flags += 1 << 26;
+ flags += 1
L
<< 26;
# endif
# endif
#else
# endif
# endif
#else
- flags += 1 << 24;
+ flags += 1
L
<< 24;
# ifdef NO_snprintf
# ifdef NO_snprintf
- flags += 1 << 25;
+ flags += 1
L
<< 25;
# ifdef HAS_sprintf_void
# ifdef HAS_sprintf_void
- flags += 1 << 26;
+ flags += 1
L
<< 26;
# endif
# else
# ifdef HAS_snprintf_void
# endif
# else
# ifdef HAS_snprintf_void
- flags += 1 << 26;
+ flags += 1
L
<< 26;
# endif
# endif
#endif
# endif
# endif
#endif
@@
-141,7
+137,10
@@
const char * ZEXPORT zError(err)
}
#if defined(_WIN32_WCE)
}
#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
int errno = 0;
#endif