diff options
author | Mark Adler <madler@alumni.caltech.edu> | 2011-09-09 23:24:33 -0700 |
---|---|---|
committer | Mark Adler <madler@alumni.caltech.edu> | 2011-09-09 23:24:33 -0700 |
commit | 0484693e1723bbab791c56f95597bd7dbe867d03 (patch) | |
tree | 8f31dbed98b4390da74a90b484f2accf8f8a3a8e /zutil.h | |
parent | 9811b53dd9e8f67015c7199fff12b5bfc6965330 (diff) | |
download | zlib-0484693e1723bbab791c56f95597bd7dbe867d03.tar.gz zlib-0484693e1723bbab791c56f95597bd7dbe867d03.tar.bz2 zlib-0484693e1723bbab791c56f95597bd7dbe867d03.zip |
zlib 1.2.2.2v1.2.2.2
Diffstat (limited to 'zutil.h')
-rw-r--r-- | zutil.h | 17 |
1 files changed, 8 insertions, 9 deletions
@@ -22,6 +22,14 @@ | |||
22 | # include <stdlib.h> | 22 | # include <stdlib.h> |
23 | #endif | 23 | #endif |
24 | #ifdef NO_ERRNO_H | 24 | #ifdef NO_ERRNO_H |
25 | # ifdef _WIN32_WCE | ||
26 | /* The Microsoft C Run-Time Library for Windows CE doesn't have | ||
27 | * errno. We define it as a global variable to simplify porting. | ||
28 | * Its value is always 0 and should not be used. We rename it to | ||
29 | * avoid conflict with other libraries that use the same workaround. | ||
30 | */ | ||
31 | # define errno z_errno | ||
32 | # endif | ||
25 | extern int errno; | 33 | extern int errno; |
26 | #else | 34 | #else |
27 | # include <errno.h> | 35 | # include <errno.h> |
@@ -193,15 +201,6 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ | |||
193 | # define NO_vsnprintf | 201 | # define NO_vsnprintf |
194 | #endif | 202 | #endif |
195 | 203 | ||
196 | #ifdef HAVE_STRERROR | ||
197 | # ifndef VMS | ||
198 | extern char *strerror OF((int)); | ||
199 | # endif | ||
200 | # define zstrerror(errnum) strerror(errnum) | ||
201 | #else | ||
202 | # define zstrerror(errnum) "" | ||
203 | #endif | ||
204 | |||
205 | #if defined(pyr) | 204 | #if defined(pyr) |
206 | # define NO_MEMCPY | 205 | # define NO_MEMCPY |
207 | #endif | 206 | #endif |