diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2008-09-01 21:26:47 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2008-09-01 21:26:47 +0000 |
| commit | b4983fe4c3f633f88d7001690ff37218fb8a3245 (patch) | |
| tree | 91437cedd1ed1e109c653c9188015ac465d08690 /cpukit/zlib/zconf.h | |
| parent | 2008-09-01 Ralf Corsépius <ralf.corsepius@rtems.org> (diff) | |
| download | rtems-b4983fe4c3f633f88d7001690ff37218fb8a3245.tar.bz2 | |
Upgrade to zlib-1.2.3.
Diffstat (limited to 'cpukit/zlib/zconf.h')
| -rw-r--r-- | cpukit/zlib/zconf.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/cpukit/zlib/zconf.h b/cpukit/zlib/zconf.h index 1060bcdc69..5a5ddb8620 100644 --- a/cpukit/zlib/zconf.h +++ b/cpukit/zlib/zconf.h @@ -1,9 +1,9 @@ /* 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 */ -/* $Id$ */ +/* @(#) $Id$ */ #ifndef ZCONF_H #define ZCONF_H @@ -70,8 +70,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__) |