diff options
Diffstat (limited to 'zutil.h')
-rw-r--r-- | zutil.h | 8 |
1 files changed, 3 insertions, 5 deletions
@@ -8,7 +8,7 @@ | |||
8 | subject to change. Applications should only use zlib.h. | 8 | subject to change. Applications should only use zlib.h. |
9 | */ | 9 | */ |
10 | 10 | ||
11 | /* $Id: zutil.h,v 1.5 1995/04/14 21:22:38 jloup Exp $ */ | 11 | /* $Id: zutil.h,v 1.6 1995/04/29 15:52:16 jloup Exp $ */ |
12 | 12 | ||
13 | #ifndef _Z_UTIL_H | 13 | #ifndef _Z_UTIL_H |
14 | #define _Z_UTIL_H | 14 | #define _Z_UTIL_H |
@@ -20,9 +20,8 @@ | |||
20 | #else | 20 | #else |
21 | extern int errno; | 21 | extern int errno; |
22 | #endif | 22 | #endif |
23 | #ifdef __STDC__ | 23 | #ifdef STDC |
24 | # include <string.h> | 24 | # include <string.h> |
25 | # include <memory.h> | ||
26 | #endif | 25 | #endif |
27 | 26 | ||
28 | #ifndef local | 27 | #ifndef local |
@@ -66,7 +65,6 @@ extern char *z_errmsg[]; /* indexed by 1-zlib_error */ | |||
66 | # define OS_CODE 0x00 | 65 | # define OS_CODE 0x00 |
67 | # ifdef __TURBOC__ | 66 | # ifdef __TURBOC__ |
68 | # include <alloc.h> | 67 | # include <alloc.h> |
69 | # define exit(n) _exit(n) | ||
70 | # else /* MSC */ | 68 | # else /* MSC */ |
71 | # include <malloc.h> | 69 | # include <malloc.h> |
72 | # endif | 70 | # endif |
@@ -125,7 +123,7 @@ extern char *z_errmsg[]; /* indexed by 1-zlib_error */ | |||
125 | # define zstrerror(errnum) "" | 123 | # define zstrerror(errnum) "" |
126 | #endif | 124 | #endif |
127 | 125 | ||
128 | #if defined(__STDC__) && !defined(HAVE_MEMCPY) | 126 | #if defined(STDC) && !defined(HAVE_MEMCPY) |
129 | # define HAVE_MEMCPY | 127 | # define HAVE_MEMCPY |
130 | #endif | 128 | #endif |
131 | #ifdef HAVE_MEMCPY | 129 | #ifdef HAVE_MEMCPY |