diff options
| author | jimw@mysql.com <> | 2005-08-09 10:22:48 -0700 |
|---|---|---|
| committer | jimw@mysql.com <> | 2005-08-09 10:22:48 -0700 |
| commit | f7aee86aa735519d81abd41fdc28bcd1b022f8f7 (patch) | |
| tree | 9b1ac253febefb83c1d2f4e1d369db3b53a16727 /zlib/zconf.h | |
| parent | 535ba76b98cf45d005aba07000115d083f6f6ee8 (diff) | |
| download | mariadb-git-f7aee86aa735519d81abd41fdc28bcd1b022f8f7.tar.gz | |
Import zlib-1.2.3 library
Diffstat (limited to 'zlib/zconf.h')
| -rw-r--r-- | zlib/zconf.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/zlib/zconf.h b/zlib/zconf.h index 3c21403fce6..03a9431c8be 100644 --- a/zlib/zconf.h +++ b/zlib/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__) |