diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2011-03-18 10:10:55 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2011-03-18 10:10:55 +0000 |
| commit | 8198f694f52b6a6284069a37b44bcce5847acdf2 (patch) | |
| tree | 37d98345fa38b6c25ca6e1b0658ffd45c31cbfcd /cpukit/zlib/zutil.h | |
| parent | Import from zlib-1.2.5 (diff) | |
| download | rtems-8198f694f52b6a6284069a37b44bcce5847acdf2.tar.bz2 | |
Import zlib-1.2.3
Diffstat (limited to 'cpukit/zlib/zutil.h')
| -rw-r--r-- | cpukit/zlib/zutil.h | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/cpukit/zlib/zutil.h b/cpukit/zlib/zutil.h index 5209d656cd..b7d5eff81b 100644 --- a/cpukit/zlib/zutil.h +++ b/cpukit/zlib/zutil.h @@ -1,5 +1,5 @@ /* zutil.h -- internal interface and configuration of the compression library - * Copyright (C) 1995-2004 Jean-loup Gailly. + * Copyright (C) 1995-2005 Jean-loup Gailly. * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -17,7 +17,9 @@ #include "zlib.h" #ifdef STDC -# include <stddef.h> +# ifndef _WIN32_WCE +# include <stddef.h> +# endif # include <string.h> # include <stdlib.h> #endif @@ -32,7 +34,9 @@ # endif extern int errno; #else -# include <errno.h> +# ifndef _WIN32_WCE +# include <errno.h> +# endif #endif #ifndef local @@ -113,6 +117,9 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ #ifdef OS2 # define OS_CODE 0x06 +# ifdef M_I86 + #include <malloc.h> +# endif #endif #if defined(MACOS) || defined(TARGET_OS_MAC) |