diff options
| author | des <des@FreeBSD.org> | 2006-03-23 14:09:21 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2006-03-23 14:09:21 +0000 |
| commit | ec17f7788515f838ae8c595748fbd664f1e2f1f1 (patch) | |
| tree | 297104a1ee790469dfe9ff88a857a9836926bccc /lib/libz/zconf.h | |
| parent | 6d9b0264a175d883795d7a2549ca6f2d9c2a15b7 (diff) | |
| download | FreeBSD-src-ec17f7788515f838ae8c595748fbd664f1e2f1f1.zip FreeBSD-src-ec17f7788515f838ae8c595748fbd664f1e2f1f1.tar.gz | |
Resolve conflicts.
Diffstat (limited to 'lib/libz/zconf.h')
| -rw-r--r-- | lib/libz/zconf.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/lib/libz/zconf.h b/lib/libz/zconf.h index 66e929d..205db95 100644 --- a/lib/libz/zconf.h +++ b/lib/libz/zconf.h @@ -1,5 +1,5 @@ /* 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__) |
