diff options
| author | Mark Adler <madler@alumni.caltech.edu> | 2012-05-03 21:23:45 -0700 |
|---|---|---|
| committer | Mark Adler <madler@alumni.caltech.edu> | 2012-05-03 21:23:45 -0700 |
| commit | 3a8e3bd9e566dacef78c5b2dc9509e0c6ca8964a (patch) | |
| tree | ed6d082b0d8ff68ad585f218c08ba2e138301c60 | |
| parent | c58f7ab28d5fc346032592414055db4edcc18050 (diff) | |
| download | zlib-3a8e3bd9e566dacef78c5b2dc9509e0c6ca8964a.tar.gz zlib-3a8e3bd9e566dacef78c5b2dc9509e0c6ca8964a.tar.bz2 zlib-3a8e3bd9e566dacef78c5b2dc9509e0c6ca8964a.zip | |
Avoid including stddef.h on Windows for Z_SOLO compile [Niessink].
| -rw-r--r-- | zconf.h | 4 | ||||
| -rw-r--r-- | zconf.h.cmakein | 4 | ||||
| -rw-r--r-- | zconf.h.in | 4 |
3 files changed, 9 insertions, 3 deletions
| @@ -426,7 +426,9 @@ typedef uLong FAR uLongf; | |||
| 426 | #endif | 426 | #endif |
| 427 | 427 | ||
| 428 | #ifdef _WIN32 | 428 | #ifdef _WIN32 |
| 429 | # include <stddef.h> /* for wchar_t */ | 429 | # ifndef Z_SOLO |
| 430 | # include <stddef.h> /* for wchar_t */ | ||
| 431 | # endif | ||
| 430 | #endif | 432 | #endif |
| 431 | 433 | ||
| 432 | /* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and | 434 | /* 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; | |||
| 428 | #endif | 428 | #endif |
| 429 | 429 | ||
| 430 | #ifdef _WIN32 | 430 | #ifdef _WIN32 |
| 431 | # include <stddef.h> /* for wchar_t */ | 431 | # ifndef Z_SOLO |
| 432 | # include <stddef.h> /* for wchar_t */ | ||
| 433 | # endif | ||
| 432 | #endif | 434 | #endif |
| 433 | 435 | ||
| 434 | /* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and | 436 | /* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and |
| @@ -426,7 +426,9 @@ typedef uLong FAR uLongf; | |||
| 426 | #endif | 426 | #endif |
| 427 | 427 | ||
| 428 | #ifdef _WIN32 | 428 | #ifdef _WIN32 |
| 429 | # include <stddef.h> /* for wchar_t */ | 429 | # ifndef Z_SOLO |
| 430 | # include <stddef.h> /* for wchar_t */ | ||
| 431 | # endif | ||
| 430 | #endif | 432 | #endif |
| 431 | 433 | ||
| 432 | /* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and | 434 | /* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and |
