Move private defines from zconf.h and zconf-ng.h to zbuild.h

* move definition of z_size_t to zbuild.h

diff --git a/adler32.c b/adler32.c
index 24e959354803a306a4b1c48a926092c7661ebe9c..5724b2d13fc20dfdbe82607ccaa26016c538ccb1 100644 (file)
--- a/adler32.c
+++ b/adler32.c
@@ -5,6 +5,7 @@
 
 /* @(#) $Id$ */
 
+#include "zbuild.h"
 #include "zutil.h"
 #include "functable.h"
 

diff --git a/arch/aarch64/fill_window_arm.c b/arch/aarch64/fill_window_arm.c
index e7388a8d57aa20c1885f21ecfd74357bf24ea1da..3df6d639784fd08869108486da4a9add972f3418 100644 (file)
--- a/arch/aarch64/fill_window_arm.c
+++ b/arch/aarch64/fill_window_arm.c
@@ -10,6 +10,7 @@
 
 /* @(#) $Id$ */
 
+#include "zbuild.h"
 #include "deflate.h"
 #include "deflate_p.h"
 #include "functable.h"

diff --git a/arch/aarch64/insert_string_acle.c b/arch/aarch64/insert_string_acle.c
index 629614cc3a4f7defb297a0d5fa2a6b66da559a69..49f11cb35369c4ab06ff62107e2ad823d5e38650 100644 (file)
--- a/arch/aarch64/insert_string_acle.c
+++ b/arch/aarch64/insert_string_acle.c
@@ -5,6 +5,7 @@
  *
  */
 
+#include "zbuild.h"
 #ifdef __ARM_FEATURE_CRC32
 #include <arm_acle.h>
 #endif

diff --git a/arch/arm/fill_window_arm.c b/arch/arm/fill_window_arm.c
index c27db3c77d4ccf175f63e4dbb55c30780e331a95..8065e4174d88e730634d47f22804b11041a315c3 100644 (file)
--- a/arch/arm/fill_window_arm.c
+++ b/arch/arm/fill_window_arm.c
@@ -10,6 +10,7 @@
 
 /* @(#) $Id$ */
 
+#include "zbuild.h"
 #include "deflate.h"
 #include "deflate_p.h"
 #include "functable.h"

diff --git a/arch/arm/insert_string_acle.c b/arch/arm/insert_string_acle.c
index 629614cc3a4f7defb297a0d5fa2a6b66da559a69..49f11cb35369c4ab06ff62107e2ad823d5e38650 100644 (file)
--- a/arch/arm/insert_string_acle.c
+++ b/arch/arm/insert_string_acle.c
@@ -5,6 +5,7 @@
  *
  */
 
+#include "zbuild.h"
 #ifdef __ARM_FEATURE_CRC32
 #include <arm_acle.h>
 #endif

diff --git a/arch/x86/crc_folding.c b/arch/x86/crc_folding.c
index 503c39fdd3ddf59633dc6f16cb50ce06ec937fc6..fb9ccba8e3094b80a50247e08bf12bcf78d4e0ec 100644 (file)
--- a/arch/x86/crc_folding.c
+++ b/arch/x86/crc_folding.c
@@ -18,6 +18,7 @@
 
 #ifdef X86_PCLMULQDQ_CRC
 
+#include "zbuild.h"
 #include <inttypes.h>
 #include <immintrin.h>
 #include <wmmintrin.h>

diff --git a/arch/x86/crc_pclmulqdq.c b/arch/x86/crc_pclmulqdq.c
index ac0b7eb9dcc8f523cbbff5eeb62d4929584f7a18..0c2896a000a95df88def5305470048145a1d0b39 100644 (file)
--- a/arch/x86/crc_pclmulqdq.c
+++ b/arch/x86/crc_pclmulqdq.c
@@ -4,6 +4,7 @@
  *
  */
 
+#include "zbuild.h"
 #include "x86.h"
 #include "crc_folding.h"
 #include "deflate.h"

diff --git a/arch/x86/deflate_quick.c b/arch/x86/deflate_quick.c
index 2c645b8c6ef10086477ecc10564c82506fef7743..dc72ca5ad62257958364a27913d86b2719d2d6f0 100644 (file)
--- a/arch/x86/deflate_quick.c
+++ b/arch/x86/deflate_quick.c
@@ -17,6 +17,7 @@
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
+#include "zbuild.h"
 #include <immintrin.h>
 #ifdef _MSC_VER
 #  include <nmmintrin.h>

diff --git a/arch/x86/fill_window_sse.c b/arch/x86/fill_window_sse.c
index 7d6f88d5de2139fb9279312300cad4ddc5ba36c1..91e56b269a4bedf25c6484cbe688e3373ecaf41c 100644 (file)
--- a/arch/x86/fill_window_sse.c
+++ b/arch/x86/fill_window_sse.c
@@ -10,6 +10,7 @@
  */
 #ifdef X86_SSE2_FILL_WINDOW
 
+#include "zbuild.h"
 #include <immintrin.h>
 #include "deflate.h"
 #include "deflate_p.h"

diff --git a/arch/x86/insert_string_sse.c b/arch/x86/insert_string_sse.c
index a0ae9322da5d37f2f1020713cdd95678e633100f..cb756ac5c371a9eeb5c1523ca1f7bd1ea32efa5d 100644 (file)
--- a/arch/x86/insert_string_sse.c
+++ b/arch/x86/insert_string_sse.c
@@ -5,6 +5,7 @@
  *
  */
 
+#include "zbuild.h"
 #include "deflate.h"
 
 /* ===========================================================================

diff --git a/compress.c b/compress.c
index ce169ef971568b583b0af0412c1f299172d41cef..6b493fda50afa63211b53f0bde1901b8882a9f0f 100644 (file)
--- a/compress.c
+++ b/compress.c
@@ -6,12 +6,11 @@
 /* @(#) $Id$ */
 
 #define ZLIB_INTERNAL
+#include "zbuild.h"
 #if defined(ZLIB_COMPAT)
 # include "zlib.h"
-# define z_size_t unsigned long
 #else
 # include "zlib-ng.h"
-# define z_size_t size_t
 #endif
 
 /* ===========================================================================

diff --git a/crc32.c b/crc32.c
index 8883358b72bc3538537621856752a5db93a63e20..e0f9ec47fd23406007efe22b10adb94cc730364d 100644 (file)
--- a/crc32.c
+++ b/crc32.c
@@ -11,6 +11,7 @@
 
 /* @(#) $Id$ */
 
+# include "zbuild.h"
 # include "gzendian.h"
 
 /*

diff --git a/deflate.c b/deflate.c
index 54e84d396acddec5be08cd23908722bc192776d8..13ebc8b61d62eb310e951c66d5e16888d916ddc6 100644 (file)
--- a/deflate.c
+++ b/deflate.c
@@ -49,6 +49,7 @@
 
 /* @(#) $Id$ */
 
+#include "zbuild.h"
 #include "deflate.h"
 #include "deflate_p.h"
 #include "match.h"

diff --git a/deflate_fast.c b/deflate_fast.c
index e36bd7906805510512d2d2bac891251689d62bbf..7c74dbe92519ac6c83d404b13ec9c7a20cedfe2e 100644 (file)
--- a/deflate_fast.c
+++ b/deflate_fast.c
@@ -4,6 +4,7 @@
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
+#include "zbuild.h"
 #include "deflate.h"
 #include "deflate_p.h"
 #include "match.h"

diff --git a/deflate_medium.c b/deflate_medium.c
index cfff294639f411993562aada72813a23f39ca828..5cb07370497ac2365f30f4bb682a396140b3454d 100644 (file)
--- a/deflate_medium.c
+++ b/deflate_medium.c
@@ -7,6 +7,7 @@
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 #ifdef MEDIUM_STRATEGY
+#include "zbuild.h"
 #include "deflate.h"
 #include "deflate_p.h"
 #include "match.h"

diff --git a/deflate_slow.c b/deflate_slow.c
index 2cbb1e0b1a28796863e5ddeab92db7c233726e1c..17634774014aeeb445f079e6707fa4bcfe3e37e9 100644 (file)
--- a/deflate_slow.c
+++ b/deflate_slow.c
@@ -4,6 +4,7 @@
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
+#include "zbuild.h"
 #include "deflate.h"
 #include "deflate_p.h"
 #include "match.h"

diff --git a/functable.c b/functable.c
index 3921fc9de7288ba67f80554bd1d7005aedcd1a8b..d58ddbd0ada541935a0e4ff3a453075ee6192bac 100644 (file)
--- a/functable.c
+++ b/functable.c
@@ -3,6 +3,7 @@
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
+#include "zbuild.h"
 #include "functable.h"
 #include "deflate.h"
 #include "deflate_p.h"

diff --git a/gzclose.c b/gzclose.c
index 12f34c5d4dd89ff37977f9027c2bdbc1e17cc5bb..bafb774c8ae7417aa45ab0643fa16025f5374f1b 100644 (file)
--- a/gzclose.c
+++ b/gzclose.c
@@ -3,6 +3,7 @@
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
+#include "zbuild.h"
 #include "gzguts.h"
 
 /* gzclose() is in a separate file so that it is linked in only if it is used.

diff --git a/gzlib.c b/gzlib.c
index 7b0e136ebf01a5a9c0136916e9bfd51d6cea22d0..946fb2b4153f1573b47f398ded0a22ecdd27579c 100644 (file)
--- a/gzlib.c
+++ b/gzlib.c
@@ -3,6 +3,7 @@
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
+#include "zbuild.h"
 #include "gzguts.h"
 
 #if defined(WIN32) && !defined(__BORLANDC__) && !defined(__MINGW32__)

diff --git a/gzread.c b/gzread.c
index 47f2f7525820061105c0ecac82e6d364c0ace2ad..dc4f50f820228c5910e6dd4aebd1879a0c2b5969 100644 (file)
--- a/gzread.c
+++ b/gzread.c
@@ -3,6 +3,7 @@
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
+#include "zbuild.h"
 #include "gzguts.h"
 
 /* Local functions */

diff --git a/gzwrite.c b/gzwrite.c
index f07dc1af3bae1985fc0f40bb45d3e84c65b4f13e..0476d9a07d1641a743d0171c767f0dd7eae78212 100644 (file)
--- a/gzwrite.c
+++ b/gzwrite.c
@@ -3,6 +3,7 @@
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
+#include "zbuild.h"
 #include <stdarg.h>
 #include "gzguts.h"
 

diff --git a/infback.c b/infback.c
index 337a3ba0b1dff00e0c04baf0000a63fce47757ce..04553b72aed2a5001c241dfa1db0f53846110167 100644 (file)
--- a/infback.c
+++ b/infback.c
@@ -10,6 +10,7 @@
    inflate_fast() can be used with either inflate.c or infback.c.
  */
 
+#include "zbuild.h"
 #include "zutil.h"
 #include "inftrees.h"
 #include "inflate.h"

diff --git a/inffast.c b/inffast.c
index ca05b2f402ed852a1d397dab1e885bf699131e4c..501a42d1f5ae1d1f79fd61af2bda5a269c7911c4 100644 (file)
--- a/inffast.c
+++ b/inffast.c
@@ -3,6 +3,7 @@
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
+#include "zbuild.h"
 #include "zutil.h"
 #include "inftrees.h"
 #include "inflate.h"

diff --git a/inflate.c b/inflate.c
index 8b3e930d47c3ef00de1901c8ce2ebd0385cd0732..bbab72e3e444ede98bf247a8b4b65edbe552f841 100644 (file)
--- a/inflate.c
+++ b/inflate.c
@@ -80,6 +80,7 @@
  * The history for versions after 1.2.0 are in ChangeLog in zlib distribution.
  */
 
+#include "zbuild.h"
 #include "zutil.h"
 #include "inftrees.h"
 #include "inflate.h"

diff --git a/inftrees.c b/inftrees.c
index 3f4bb0189936cdb8055d0cd3acf6b9e271f44be7..51e85375cab6748c4c2e81808bf1bfd041a03fa7 100644 (file)
--- a/inftrees.c
+++ b/inftrees.c
@@ -3,6 +3,7 @@
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
+#include "zbuild.h"
 #include "zutil.h"
 #include "inftrees.h"
 

diff --git a/match.c b/match.c
index a3885ccad6111204862e2f2b956571dd37cccc3a..fd55c3e1300123370333a8595b17d79335b6b5fe 100644 (file)
--- a/match.c
+++ b/match.c
@@ -8,6 +8,7 @@
  * OUT assertion: the match length is not greater than s->lookahead
  */
 
+#include "zbuild.h"
 #include "deflate.h"
 
 #if (defined(UNALIGNED_OK) && MAX_MATCH == 258)

diff --git a/test/example.c b/test/example.c
index 4fafc35e46b48d2dc4366aee87cfeb65b42fb11c..b31b4cb7baec79e7bf30e9775e79605fb0db159f 100644 (file)
--- a/test/example.c
+++ b/test/example.c
@@ -5,12 +5,11 @@
 
 /* @(#) $Id$ */
 
+#include "zbuild.h"
 #ifdef ZLIB_COMPAT
 #  include "zlib.h"
-#  define z_size_t unsigned long
 #else
 #  include "zlib-ng.h"
-#  define z_size_t size_t
 #endif
 
 #include <stdio.h>

diff --git a/test/minigzip.c b/test/minigzip.c
index e19bda1dcbe6efb806b58c46698d5fdcdcd58bfc..dc06c35acf88cf1187543d34ed8fcbe05b774c73 100644 (file)
--- a/test/minigzip.c
+++ b/test/minigzip.c
@@ -14,6 +14,7 @@
 
 /* @(#) $Id$ */
 
+#include "zbuild.h"
 #ifdef ZLIB_COMPAT
 # include "zlib.h"
 #else

diff --git a/trees.c b/trees.c
index eedfdf02acafbc53dc95fedf83edb20295042c15..5a321b94f516e5eb4f8ef8384bea9b24f2e91128 100644 (file)
--- a/trees.c
+++ b/trees.c
@@ -34,6 +34,7 @@
 
 /* #define GEN_TREES_H */
 
+#include "zbuild.h"
 #include "deflate.h"
 
 #ifdef ZLIB_DEBUG

diff --git a/uncompr.c b/uncompr.c
index 77b931ca0da063ddeaa98c0aba3505ca7c09adc6..9f0ac2a0cf341ef23d1ca710e22d8a81dccf9d8c 100644 (file)
--- a/uncompr.c
+++ b/uncompr.c
@@ -6,12 +6,11 @@
 /* @(#) $Id$ */
 
 #define ZLIB_INTERNAL
+#include "zbuild.h"
 #ifdef ZLIB_COMPAT
 # include "zlib.h"
-# define z_size_t unsigned long
 #else
 # include "zlib-ng.h"
-# define z_size_t size_t
 #endif
 
 /* ===========================================================================

diff --git a/zbuild.h b/zbuild.h
new file mode 100644 (file)
index 0000000..e2e6fc3
--- /dev/null
+++ b/zbuild.h
@@ -0,0 +1,24 @@
+#ifndef _ZBUILD_H
+#define _ZBUILD_H
+
+/* This has to be first include that defines any types */
+#if defined(_MSC_VER)
+#  include <windows.h>
+   typedef SSIZE_T ssize_t;
+#endif
+
+#if defined(ZLIB_COMPAT)
+#  define PREFIX(x) x
+#  define PREFIX2(x) ZLIB_ ## x
+#  define PREFIX3(x) z_ ## x
+#  define zVersion zlibVersion
+#  define z_size_t unsigned long
+#else
+#  define PREFIX(x) zng_ ## x
+#  define PREFIX2(x) ZLIBNG_ ## x
+#  define PREFIX3(x) zng_ ## x
+#  define zVersion zlibng_version
+#  define z_size_t size_t
+#endif
+
+#endif

diff --git a/zconf-ng.h.in b/zconf-ng.h.in
index c6b06a27e3f61c80971fc0365040cc0f6b21feac..73845eed4c8ef07318e13ad50f98bb9e04e8b935 100644 (file)
--- a/zconf-ng.h.in
+++ b/zconf-ng.h.in
@@ -8,11 +8,6 @@
 #ifndef ZCONFNG_H
 #define ZCONFNG_H
 
-#define PREFIX(x) zng_ ## x
-#define PREFIX2(x) ZLIBNG_ ## x
-#define PREFIX3(x) zng_ ## x
-#define zVersion zlibng_version
-
 #if defined(_WINDOWS) && !defined(WINDOWS)
 #  define WINDOWS
 #endif

diff --git a/zconf.h.in b/zconf.h.in
index 778f54a244f2b9c62d2675934255c7b86be5ce57..8f741c4653530bcddfb38db5e992ffb697332026 100644 (file)
--- a/zconf.h.in
+++ b/zconf.h.in
@@ -8,11 +8,6 @@
 #ifndef ZCONF_H
 #define ZCONF_H
 
-#define PREFIX(x) x
-#define PREFIX2(x) ZLIB_ ## x
-#define PREFIX3(x) z_ ## x
-#define zVersion zlibVersion
-
 #if defined(_WINDOWS) && !defined(WINDOWS)
 #  define WINDOWS
 #endif
@@ -84,10 +79,6 @@
 #    define ZEXPORT WINAPI
 #    define ZEXPORTVA WINAPIV
 #  endif
-#  if defined(_MSC_VER)
-#    include <windows.h>
-     typedef SSIZE_T ssize_t;
-#  endif
 #endif
 
 #ifndef ZEXTERN

diff --git a/zutil.c b/zutil.c
index 70ffb84e052434b6b31f6db3bd0c9ce2da0c0a13..84720e6c962b1d7884a986384e1a5714a6021d7d 100644 (file)
--- a/zutil.c
+++ b/zutil.c
@@ -5,6 +5,7 @@
 
 /* @(#) $Id$ */
 
+#include "zbuild.h"
 #include "zutil.h"
 #ifdef WITH_GZFILEOP
 #  include "gzguts.h"