diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2011-03-18 10:10:55 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2011-03-18 10:10:55 +0000 |
| commit | 8198f694f52b6a6284069a37b44bcce5847acdf2 (patch) | |
| tree | 37d98345fa38b6c25ca6e1b0658ffd45c31cbfcd /cpukit/zlib/zconf.h | |
| parent | Import from zlib-1.2.5 (diff) | |
| download | rtems-8198f694f52b6a6284069a37b44bcce5847acdf2.tar.bz2 | |
Import zlib-1.2.3
Diffstat (limited to 'cpukit/zlib/zconf.h')
| -rw-r--r-- | cpukit/zlib/zconf.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/cpukit/zlib/zconf.h b/cpukit/zlib/zconf.h index 6897bf0235..03a9431c8b 100644 --- a/cpukit/zlib/zconf.h +++ b/cpukit/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 */ @@ -68,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__) |