From: Nathan Moinvaziri <nathan@nathanm.com>
Date: Wed, 26 Jan 2022 19:30:34 +0000 (-0800)
Subject: Move _POSIX_C_SOURCE define before first stdlib.h include in zbuild.h for posix_memalign.
X-Git-Tag: 2.1.0-beta1~407
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b7192b694cc2b6405be570b35bf1b4fc5317930e;p=thirdparty%2Fzlib-ng.git

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 3963fc2f9..33232dedd 100644
--- 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 5874bb533..e2002d516 100644
--- 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 11fb19f0f..71cdf99ec 100644
--- 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 65df26a64..053a3e101 100644
--- 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 864b84126..411459721 100644
--- 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 a4547feaf..e59c72083 100644
--- 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 0c7a79a7d..819148d2b 100644
--- 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 49f5e7fa1..810a56072 100644
--- 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 f82cfcc30..2ea280f21 100644
--- 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 e2e4bad3b..34fc66430 100644
--- 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 1e1fb00a5..a065dbcff 100644
--- 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 38f890956..56e8c0ca1 100644
--- 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 6d112c4a6..83718eb0b 100644
--- 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 9430ba34f..d2b6a922d 100644
--- 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 55f00611b..fdfb4438a 100644
--- 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__)