From 3a8e3bd9e566dacef78c5b2dc9509e0c6ca8964a Mon Sep 17 00:00:00 2001 From: Mark Adler Date: Thu, 3 May 2012 21:23:45 -0700 Subject: Avoid including stddef.h on Windows for Z_SOLO compile [Niessink]. --- zconf.h | 4 +++- zconf.h.cmakein | 4 +++- zconf.h.in | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/zconf.h b/zconf.h index 8a46a58..c71cade 100644 --- a/zconf.h +++ b/zconf.h @@ -426,7 +426,9 @@ typedef uLong FAR uLongf; #endif #ifdef _WIN32 -# include /* for wchar_t */ +# ifndef Z_SOLO +# include /* for wchar_t */ +# endif #endif /* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and diff --git a/zconf.h.cmakein b/zconf.h.cmakein index b6ca59a..1d31b67 100644 --- a/zconf.h.cmakein +++ b/zconf.h.cmakein @@ -428,7 +428,9 @@ typedef uLong FAR uLongf; #endif #ifdef _WIN32 -# include /* for wchar_t */ +# ifndef Z_SOLO +# include /* for wchar_t */ +# endif #endif /* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and diff --git a/zconf.h.in b/zconf.h.in index 8a46a58..c71cade 100644 --- a/zconf.h.in +++ b/zconf.h.in @@ -426,7 +426,9 @@ typedef uLong FAR uLongf; #endif #ifdef _WIN32 -# include /* for wchar_t */ +# ifndef Z_SOLO +# include /* for wchar_t */ +# endif #endif /* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and -- cgit v1.2.3-55-g6feb