diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2008-09-01 21:26:47 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2008-09-01 21:26:47 +0000 |
| commit | b4983fe4c3f633f88d7001690ff37218fb8a3245 (patch) | |
| tree | 91437cedd1ed1e109c653c9188015ac465d08690 /cpukit/zlib/zutil.h | |
| parent | 2008-09-01 Ralf Corsépius <ralf.corsepius@rtems.org> (diff) | |
| download | rtems-b4983fe4c3f633f88d7001690ff37218fb8a3245.tar.bz2 | |
Upgrade to zlib-1.2.3.
Diffstat (limited to 'cpukit/zlib/zutil.h')
| -rw-r--r-- | cpukit/zlib/zutil.h | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/cpukit/zlib/zutil.h b/cpukit/zlib/zutil.h index 601aeb2ccf..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 */ @@ -8,7 +8,7 @@ subject to change. Applications should only use zlib.h. */ -/* $Id$ */ +/* @(#) $Id$ */ #ifndef ZUTIL_H #define ZUTIL_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) @@ -251,7 +258,7 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ #endif -voidpf zcalloc OF((voidpf opaque, uInt items, uInt size)); +voidpf zcalloc OF((voidpf opaque, unsigned items, unsigned size)); void zcfree OF((voidpf opaque, voidpf ptr)); #define ZALLOC(strm, items, size) \ |