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

13 years ago · 3a8e3bd9e5
parent c58f7ab28d
commit 3a8e3bd9e5
3 changed files with 9 additions and 3 deletions
--- 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
--- 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
--- 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