diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 2005-07-20 15:56:47 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 2005-07-20 15:56:47 +0000 |
| commit | 2cf630da4ce8cccae74ab052eb0055de8afc9502 (patch) | |
| tree | 32220b8c594ae0352770c85d0463f63af944cf11 /sys/lib/libz/zconf.h | |
| parent | 9ba66e2144908c121085b905f0ebf384b79343ba (diff) | |
Update to zlib 1.2.3; OK deraadt@
Diffstat (limited to 'sys/lib/libz/zconf.h')
| -rw-r--r-- | sys/lib/libz/zconf.h | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/sys/lib/libz/zconf.h b/sys/lib/libz/zconf.h index 0ccb9fd9632..ff707762c69 100644 --- a/sys/lib/libz/zconf.h +++ b/sys/lib/libz/zconf.h @@ -1,6 +1,6 @@ -/* $OpenBSD: zconf.h,v 1.9 2004/12/03 03:07:09 djm Exp $ */ +/* $OpenBSD: zconf.h,v 1.10 2005/07/20 15:56:46 millert Exp $ */ /* zconf.h -- configuration of the zlib 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 */ @@ -43,6 +43,10 @@ # define get_crc_table z_get_crc_table # define zError z_zError +# define alloc_func z_alloc_func +# define free_func z_free_func +# define in_func z_in_func +# define out_func z_out_func # define Byte z_Byte # define uInt z_uInt # define uLong z_uLong @@ -64,8 +68,10 @@ #if defined(_WINDOWS) && !defined(WINDOWS) # define WINDOWS #endif -#if (defined(_WIN32) || defined(__WIN32__)) && !defined(WIN32) -# define WIN32 +#if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__) +# ifndef WIN32 +# define WIN32 +# endif #endif #if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32) # if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__) |