From 2cf630da4ce8cccae74ab052eb0055de8afc9502 Mon Sep 17 00:00:00 2001 From: "Todd C. Miller" Date: Wed, 20 Jul 2005 15:56:47 +0000 Subject: Update to zlib 1.2.3; OK deraadt@ --- lib/libz/zutil.h | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) (limited to 'lib/libz/zutil.h') diff --git a/lib/libz/zutil.h b/lib/libz/zutil.h index e64c7decef6..5726e189925 100644 --- a/lib/libz/zutil.h +++ b/lib/libz/zutil.h @@ -1,6 +1,6 @@ -/* $OpenBSD: zutil.h,v 1.8 2004/12/03 03:06:37 djm Exp $ */ +/* $OpenBSD: zutil.h,v 1.9 2005/07/20 15:56:42 millert Exp $ */ /* 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 */ @@ -20,14 +20,26 @@ #include #else #ifdef STDC -# include +# ifndef _WIN32_WCE +# include +# endif # include # include #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 +# ifndef _WIN32_WCE +# include +# endif #endif #endif @@ -109,6 +121,9 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ #ifdef OS2 # define OS_CODE 0x06 +# ifdef M_I86 + #include +# endif #endif #if defined(MACOS) || defined(TARGET_OS_MAC) @@ -197,15 +212,6 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ # define NO_vsnprintf #endif -#ifdef HAVE_STRERROR -# ifndef VMS - extern char *strerror OF((int)); -# endif -# define zstrerror(errnum) strerror(errnum) -#else -# define zstrerror(errnum) "" -#endif - #if defined(pyr) # define NO_MEMCPY #endif -- cgit v1.2.3