Move zlib include to zip/unzip headers like org minizip.

zlib-ng · Nov 11, 2024 · 3bced61 · 3bced61
1 parent 5221967
commit 3bced61
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/compat/ioapi.h b/compat/ioapi.h
@@ -4,14 +4,6 @@
 
 #include <stdint.h>
 
-#if !defined(_ZLIB_H) && !defined(ZLIB_H) && !defined(ZLIB_H_)
-#  if __has_include(<zlib-ng.h>)
-#    include <zlib-ng.h>
-#  elif __has_include(<zlib.h>)
-#    include <zlib.h>
-#  endif
-#endif
-
 typedef uint64_t ZPOS64_T;
 
 #ifndef ZEXPORT

diff --git a/compat/unzip.h b/compat/unzip.h
@@ -19,6 +19,14 @@ extern "C" {
 
 #include <stdint.h>
 
+#if !defined(_ZLIB_H) && !defined(ZLIB_H) && !defined(ZLIB_H_)
+#  if __has_include(<zlib-ng.h>)
+#    include <zlib-ng.h>
+#  elif __has_include(<zlib.h>)
+#    include <zlib.h>
+#  endif
+#endif
+
 #ifndef _ZLIBIOAPI_H
 #  include "ioapi.h"
 #endif

diff --git a/compat/zip.h b/compat/zip.h
@@ -19,6 +19,14 @@ extern "C" {
 
 #include <stdint.h>
 
+#if !defined(_ZLIB_H) && !defined(ZLIB_H) && !defined(ZLIB_H_)
+#  if __has_include(<zlib-ng.h>)
+#    include <zlib-ng.h>
+#  elif __has_include(<zlib.h>)
+#    include <zlib.h>
+#  endif
+#endif
+
 #ifndef _ZLIBIOAPI_H
 #  include "ioapi.h"
 #endif