summaryrefslogtreecommitdiff
path: root/zconf.h
diff options
context:
space:
mode:
authorMark Adler <madler@alumni.caltech.edu>2011-09-09 23:24:43 -0700
committerMark Adler <madler@alumni.caltech.edu>2011-09-09 23:24:43 -0700
commit6b8233bfe00e79134cb1b84fc49d4f750a797f79 (patch)
treeca2b03b0169568681dc3d9c823e9f0bc4417d6b5 /zconf.h
parent0484693e1723bbab791c56f95597bd7dbe867d03 (diff)
downloadzlib-1.2.2.3.tar.gz
zlib-1.2.2.3.tar.bz2
zlib-1.2.2.3.zip
zlib 1.2.2.3v1.2.2.3
Diffstat (limited to 'zconf.h')
-rw-r--r--zconf.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/zconf.h b/zconf.h
index 6897bf0..03a9431 100644
--- a/zconf.h
+++ b/zconf.h
@@ -1,5 +1,5 @@
1/* zconf.h -- configuration of the zlib compression library 1/* zconf.h -- configuration of the zlib compression library
2 * Copyright (C) 1995-2004 Jean-loup Gailly. 2 * Copyright (C) 1995-2005 Jean-loup Gailly.
3 * For conditions of distribution and use, see copyright notice in zlib.h 3 * For conditions of distribution and use, see copyright notice in zlib.h
4 */ 4 */
5 5
@@ -68,8 +68,10 @@
68#if defined(_WINDOWS) && !defined(WINDOWS) 68#if defined(_WINDOWS) && !defined(WINDOWS)
69# define WINDOWS 69# define WINDOWS
70#endif 70#endif
71#if (defined(_WIN32) || defined(__WIN32__)) && !defined(WIN32) 71#if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__)
72# define WIN32 72# ifndef WIN32
73# define WIN32
74# endif
73#endif 75#endif
74#if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32) 76#if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32)
75# if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__) 77# if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__)