Move _POSIX_C_SOURCE define before first stdlib.h include in zbuild.h for posix_memalign.

diff --git a/test/example.c b/test/example.c
index 3963fc2f9fcf8386249fe7076d55d4c40b9eb33f..33232deddae7da6defcb847c2fa286357cf8470a 100644 (file)
--- a/test/example.c
+++ b/test/example.c
@@ -12,9 +12,6 @@
 #include "deflate.h"
 
 #include <stdio.h>
-
-#include <string.h>
-#include <stdlib.h>
 #include <stdarg.h>
 #include <inttypes.h>
 

diff --git a/test/fuzz/fuzzer_checksum.c b/test/fuzz/fuzzer_checksum.c
index 5874bb533529a1530d6318cc8107d5612c1b84d1..e2002d5167466800306609d34a760f8f61400035 100644 (file)
--- a/test/fuzz/fuzzer_checksum.c
+++ b/test/fuzz/fuzzer_checksum.c
@@ -1,9 +1,5 @@
 #include <stdio.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <string.h>
 #include <assert.h>
-#include <stdlib.h>
 
 #include "zbuild.h"
 #ifdef ZLIB_COMPAT

diff --git a/test/fuzz/fuzzer_compress.c b/test/fuzz/fuzzer_compress.c
index 11fb19f0f373ad18d04dca476626bdada84f15cf..71cdf99ecfde6ae3a630a48eda5fe129a903cede 100644 (file)
--- a/test/fuzz/fuzzer_compress.c
+++ b/test/fuzz/fuzzer_compress.c
@@ -1,9 +1,5 @@
 #include <stdio.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <string.h>
 #include <assert.h>
-#include <stdlib.h>
 
 #include "zbuild.h"
 #ifdef ZLIB_COMPAT

diff --git a/test/fuzz/fuzzer_example_dict.c b/test/fuzz/fuzzer_example_dict.c
index 65df26a6463a55a4350378f6b97c1ed344b8273b..053a3e101ae9561ad8dfd320db166a155a907c14 100644 (file)
--- a/test/fuzz/fuzzer_example_dict.c
+++ b/test/fuzz/fuzzer_example_dict.c
@@ -1,9 +1,5 @@
 #include <stdio.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <string.h>
 #include <assert.h>
-#include <stdlib.h>
 
 #include "zbuild.h"
 #ifdef ZLIB_COMPAT

diff --git a/test/fuzz/fuzzer_example_large.c b/test/fuzz/fuzzer_example_large.c
index 864b84126a28033b637797662c569cbc14442799..41145972189ee51d2b4be9a9daddcfcba79c5767 100644 (file)
--- a/test/fuzz/fuzzer_example_large.c
+++ b/test/fuzz/fuzzer_example_large.c
@@ -1,8 +1,5 @@
 #include <stdio.h>
-#include <stddef.h>
-#include <string.h>
 #include <assert.h>
-#include <stdlib.h>
 #include <inttypes.h>
 
 #include "zbuild.h"

diff --git a/test/fuzz/fuzzer_example_small.c b/test/fuzz/fuzzer_example_small.c
index a4547feaf10af6e63d9ffe5b399733ac8c5a45e7..e59c720835d7853ca4281d187c0c7eeb51c3c948 100644 (file)
--- a/test/fuzz/fuzzer_example_small.c
+++ b/test/fuzz/fuzzer_example_small.c
@@ -1,9 +1,5 @@
 #include <stdio.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <string.h>
 #include <assert.h>
-#include <stdlib.h>
 
 #include "zbuild.h"
 #ifdef ZLIB_COMPAT

diff --git a/test/fuzz/fuzzer_minigzip.c b/test/fuzz/fuzzer_minigzip.c
index 0c7a79a7d7f48f2a7338a656acdbd7b78ec6bf59..819148d2b35b71642fe967741746059618156e9d 100644 (file)
--- a/test/fuzz/fuzzer_minigzip.c
+++ b/test/fuzz/fuzzer_minigzip.c
@@ -12,9 +12,6 @@
  * real thing.
  */
 
-#define _POSIX_SOURCE 1  /* This file needs POSIX for fileno(). */
-#define _POSIX_C_SOURCE 200112  /* For snprintf(). */
-
 #include "zbuild.h"
 #ifdef ZLIB_COMPAT
 #  include "zlib.h"
@@ -23,8 +20,6 @@
 #endif
 #include <stdio.h>
 #include <assert.h>
-#include <string.h>
-#include <stdlib.h>
 
 #ifdef USE_MMAP
 #  include <sys/types.h>

diff --git a/test/fuzz/standalone_fuzz_target_runner.c b/test/fuzz/standalone_fuzz_target_runner.c
index 49f5e7fa196e75ee9248a525c320f8dffc408761..810a56072f76bb23cdf86c16a428fe8b57548313 100644 (file)
--- a/test/fuzz/standalone_fuzz_target_runner.c
+++ b/test/fuzz/standalone_fuzz_target_runner.c
@@ -1,6 +1,5 @@
 #include <assert.h>
 #include <stdio.h>
-#include <stdlib.h>
 
 #include "zbuild.h"
 

diff --git a/test/minideflate.c b/test/minideflate.c
index f82cfcc3022e75044e07631cc2367a8c937816da..2ea280f21ab857401be46da58ef8440fdb1a1363 100644 (file)
--- a/test/minideflate.c
+++ b/test/minideflate.c
@@ -3,15 +3,8 @@
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
-#define _POSIX_SOURCE 1  /* This file needs POSIX for fileno(). */
-#define _POSIX_C_SOURCE 200112  /* For snprintf(). */
-
 #include <stdio.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <string.h>
 #include <assert.h>
-#include <stdlib.h>
 
 #include "zbuild.h"
 #ifdef ZLIB_COMPAT
@@ -272,7 +265,7 @@ int main(int argc, char **argv) {
         } else if (argv[i][0] == '-') {
             show_help();
             return 64;   /* EX_USAGE */
-        } else 
+        } else
             break;
     }
 

diff --git a/test/minigzip.c b/test/minigzip.c
index e2e4bad3b3efda2972b3f20a27cd8ac9d7e2ee36..34fc6643094224e89976504ee914103279a4d618 100644 (file)
--- a/test/minigzip.c
+++ b/test/minigzip.c
@@ -12,9 +12,6 @@
  * real thing.
  */
 
-#define _POSIX_SOURCE 1
-#define _POSIX_C_SOURCE 200112  /* For snprintf(). */
-
 #include "zbuild.h"
 #ifdef ZLIB_COMPAT
 #  include "zlib.h"

diff --git a/test/switchlevels.c b/test/switchlevels.c
index 1e1fb00a5cffa950f1a80a572f5c6ae2fbcbee13..a065dbcff006dbf2cad14b2b7ee530f53f9012af 100644 (file)
--- a/test/switchlevels.c
+++ b/test/switchlevels.c
@@ -2,8 +2,6 @@
  * Each chunk is compressed with a user-specified level.
  */
 
-#define _POSIX_SOURCE 1  /* This file needs POSIX for fileno(). */
-
 #include "zbuild.h"
 #ifdef ZLIB_COMPAT
 #  include "zlib.h"
@@ -12,8 +10,6 @@
 #endif
 
 #include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 
 #if defined(_WIN32) || defined(__CYGWIN__)
 #  include <fcntl.h>

diff --git a/test/test_adler32.c b/test/test_adler32.c
index 38f890956fec5afdc3541a69a0cf2afff9f3435d..56e8c0ca1133ff3ec27180950ca8bc9a917c616d 100644 (file)
--- a/test/test_adler32.c
+++ b/test/test_adler32.c
@@ -4,10 +4,6 @@
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
 #include "zbuild.h"
 #ifdef ZLIB_COMPAT
 #  include "zlib.h"
@@ -15,6 +11,8 @@
 #  include "zlib-ng.h"
 #endif
 
+#include <stdio.h>
+
 typedef struct {
     uint32_t line;
     uint32_t adler;

diff --git a/test/test_crc32.c b/test/test_crc32.c
index 6d112c4a668bfe822d5bde5343750b3666937d52..83718eb0bccb59dc2e9e4b88d2e6ae76c8338d07 100644 (file)
--- a/test/test_crc32.c
+++ b/test/test_crc32.c
@@ -5,10 +5,6 @@
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
 #include "zbuild.h"
 #ifdef ZLIB_COMPAT
 #  include "zlib.h"
@@ -16,6 +12,8 @@
 #  include "zlib-ng.h"
 #endif
 
+#include <stdio.h>
+
 typedef struct {
     uint32_t line;
     unsigned long crc;

diff --git a/zbuild.h b/zbuild.h
index 9430ba34f231ea2395e2c32bd597896606729f13..d2b6a922ddc1c57487a905fb61a387fb6ba3eafe 100644 (file)
--- a/zbuild.h
+++ b/zbuild.h
@@ -1,6 +1,11 @@
 #ifndef _ZBUILD_H
 #define _ZBUILD_H
 
+#define _POSIX_SOURCE 1  /* fileno */
+#ifndef _POSIX_C_SOURCE
+#  define _POSIX_C_SOURCE 200112L /* snprintf, posix_memalign */
+#endif
+
 #include <stddef.h>
 #include <string.h>
 #include <stdlib.h>

diff --git a/zutil_p.h b/zutil_p.h
index 55f00611b3c06cbd91f8cda530c80e9a6f441a3c..fdfb4438a939735d2ce2c8b2278ca8b9ede17bdf 100644 (file)
--- a/zutil_p.h
+++ b/zutil_p.h
@@ -1,14 +1,10 @@
 /* zutil_p.h -- Private inline functions used internally in zlib-ng
- *
+ * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
 #ifndef ZUTIL_P_H
 #define ZUTIL_P_H
 
-#if defined(HAVE_POSIX_MEMALIGN) && !defined(_POSIX_C_SOURCE)
-#  define _POSIX_C_SOURCE 200112L  /* For posix_memalign(). */
-#endif
-
 #if defined(__APPLE__) || defined(HAVE_POSIX_MEMALIGN)
 #  include <stdlib.h>
 #elif defined(__FreeBSD__)