diff options
author | Mark Adler <madler@alumni.caltech.edu> | 2011-09-09 23:25:27 -0700 |
---|---|---|
committer | Mark Adler <madler@alumni.caltech.edu> | 2011-09-09 23:25:27 -0700 |
commit | b1c19ca6d82c98a8be6cd9cad7a9c5fa5e8e634e (patch) | |
tree | f0eeb8f52d07819f417411da5104c9d743dd46de /zutil.h | |
parent | abf180a067223611620dd97dd5681df7c7fa7c9b (diff) | |
download | zlib-b1c19ca6d82c98a8be6cd9cad7a9c5fa5e8e634e.tar.gz zlib-b1c19ca6d82c98a8be6cd9cad7a9c5fa5e8e634e.tar.bz2 zlib-b1c19ca6d82c98a8be6cd9cad7a9c5fa5e8e634e.zip |
zlib 1.2.3.1v1.2.3.1
Diffstat (limited to 'zutil.h')
-rw-r--r-- | zutil.h | 10 |
1 files changed, 4 insertions, 6 deletions
@@ -1,5 +1,5 @@ | |||
1 | /* zutil.h -- internal interface and configuration of the compression library | 1 | /* zutil.h -- internal interface and configuration of the compression library |
2 | * Copyright (C) 1995-2005 Jean-loup Gailly. | 2 | * Copyright (C) 1995-2006 Jean-loup Gailly. |
3 | * For conditions of distribution and use, see copyright notice in zlib.h | 3 | * For conditions of distribution and use, see copyright notice in zlib.h |
4 | */ | 4 | */ |
5 | 5 | ||
@@ -23,7 +23,7 @@ | |||
23 | # include <string.h> | 23 | # include <string.h> |
24 | # include <stdlib.h> | 24 | # include <stdlib.h> |
25 | #endif | 25 | #endif |
26 | #ifdef NO_ERRNO_H | 26 | #if defined(NO_ERRNO_H) || defined(_WIN32_WCE) |
27 | # ifdef _WIN32_WCE | 27 | # ifdef _WIN32_WCE |
28 | /* The Microsoft C Run-Time Library for Windows CE doesn't have | 28 | /* The Microsoft C Run-Time Library for Windows CE doesn't have |
29 | * errno. We define it as a global variable to simplify porting. | 29 | * errno. We define it as a global variable to simplify porting. |
@@ -34,9 +34,7 @@ | |||
34 | # endif | 34 | # endif |
35 | extern int errno; | 35 | extern int errno; |
36 | #else | 36 | #else |
37 | # ifndef _WIN32_WCE | 37 | # include <errno.h> |
38 | # include <errno.h> | ||
39 | # endif | ||
40 | #endif | 38 | #endif |
41 | 39 | ||
42 | #ifndef local | 40 | #ifndef local |
@@ -151,7 +149,7 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ | |||
151 | # define fdopen(fd,mode) NULL /* No fdopen() */ | 149 | # define fdopen(fd,mode) NULL /* No fdopen() */ |
152 | #endif | 150 | #endif |
153 | 151 | ||
154 | #if (defined(_MSC_VER) && (_MSC_VER > 600)) | 152 | #if (defined(_MSC_VER) && (_MSC_VER > 600)) && !defined __INTERIX |
155 | # if defined(_WIN32_WCE) | 153 | # if defined(_WIN32_WCE) |
156 | # define fdopen(fd,mode) NULL /* No fdopen() */ | 154 | # define fdopen(fd,mode) NULL /* No fdopen() */ |
157 | # ifndef _PTRDIFF_T_DEFINED | 155 | # ifndef _PTRDIFF_T_DEFINED |