diff options
| author | Tom Tromey <tromey@redhat.com> | 2005-09-12 17:42:53 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@redhat.com> | 2005-09-12 17:42:53 +0000 |
| commit | b34c05a44cac90ce83d02b89eee4b77e9df4bb05 (patch) | |
| tree | afad186af73219e6bb1a8cb8eac61485fb4eec97 /zlib/zutil.h | |
| parent | 2d0dbf15226d981f2fc1480d436756f29aed94c5 (diff) | |
* Imported zlib 1.2.3; merged local changes.
git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@104184 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'zlib/zutil.h')
| -rw-r--r-- | zlib/zutil.h | 29 |
1 files changed, 20 insertions, 9 deletions
diff --git a/zlib/zutil.h b/zlib/zutil.h index 65d4bd79015..3880b085d8b 100644 --- a/zlib/zutil.h +++ b/zlib/zutil.h @@ -1,5 +1,5 @@ /* zutil.h -- internal interface and configuration of the compression library - * Copyright (C) 1995-2003 Jean-loup Gailly. + * Copyright (C) 1995-2005 Jean-loup Gailly. * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -17,14 +17,26 @@ #include "zlib.h" #ifdef STDC -# include <stddef.h> +# ifndef _WIN32_WCE +# include <stddef.h> +# endif # include <string.h> # include <stdlib.h> #endif #ifdef NO_ERRNO_H +# ifdef _WIN32_WCE + /* The Microsoft C Run-Time Library for Windows CE doesn't have + * errno. We define it as a global variable to simplify porting. + * Its value is always 0 and should not be used. We rename it to + * avoid conflict with other libraries that use the same workaround. + */ +# define errno z_errno +# endif extern int errno; #else -# include <errno.h> +# ifndef _WIN32_WCE +# include <errno.h> +# endif #endif #ifndef local @@ -105,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) @@ -189,12 +204,8 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ # define NO_vsnprintf # endif #endif - -#ifdef HAVE_STRERROR - extern char *strerror OF((int)); -# define zstrerror(errnum) strerror(errnum) -#else -# define zstrerror(errnum) "" +#ifdef VMS +# define NO_vsnprintf #endif #if defined(pyr) |