From: Mark Adler <madler@alumni.caltech.edu>
Date: Fri, 4 May 2012 04:23:45 +0000 (-0700)
Subject: Avoid including stddef.h on Windows for Z_SOLO compile [Niessink].
X-Git-Tag: v1.2.7.1~56
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3a8e3bd9e566dacef78c5b2dc9509e0c6ca8964a;p=thirdparty%2Fzlib-ng.git

Avoid including stddef.h on Windows for Z_SOLO compile [Niessink].
---

diff --git a/zconf.h b/zconf.h
index 8a46a58b3..c71cade09 100644
--- a/zconf.h
+++ b/zconf.h
@@ -426,7 +426,9 @@ typedef uLong FAR uLongf;
 #endif
 
 #ifdef _WIN32
-#  include <stddef.h>           /* for wchar_t */
+#  ifndef Z_SOLO
+#    include <stddef.h>         /* 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 b6ca59ab4..1d31b67e2 100644
--- a/zconf.h.cmakein
+++ b/zconf.h.cmakein
@@ -428,7 +428,9 @@ typedef uLong FAR uLongf;
 #endif
 
 #ifdef _WIN32
-#  include <stddef.h>           /* for wchar_t */
+#  ifndef Z_SOLO
+#    include <stddef.h>         /* 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 8a46a58b3..c71cade09 100644
--- a/zconf.h.in
+++ b/zconf.h.in
@@ -426,7 +426,9 @@ typedef uLong FAR uLongf;
 #endif
 
 #ifdef _WIN32
-#  include <stddef.h>           /* for wchar_t */
+#  ifndef Z_SOLO
+#    include <stddef.h>         /* for wchar_t */
+#  endif
 #endif
 
 /* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and