From: Mika Lindqvist Date: Tue, 13 Mar 2018 09:26:19 +0000 (+0200) Subject: Move private defines from zconf.h and zconf-ng.h to zbuild.h X-Git-Tag: 1.9.9-b1~634 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=df1fd1567f0c0c807393bf7dd8f3dd3b1ba24c09;p=thirdparty%2Fzlib-ng.git 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 24e959354..5724b2d13 100644 --- 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 e7388a8d5..3df6d6397 100644 --- 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 629614cc3..49f11cb35 100644 --- 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 #endif diff --git a/arch/arm/fill_window_arm.c b/arch/arm/fill_window_arm.c index c27db3c77..8065e4174 100644 --- 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 629614cc3..49f11cb35 100644 --- 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 #endif diff --git a/arch/x86/crc_folding.c b/arch/x86/crc_folding.c index 503c39fdd..fb9ccba8e 100644 --- a/arch/x86/crc_folding.c +++ b/arch/x86/crc_folding.c @@ -18,6 +18,7 @@ #ifdef X86_PCLMULQDQ_CRC +#include "zbuild.h" #include #include #include diff --git a/arch/x86/crc_pclmulqdq.c b/arch/x86/crc_pclmulqdq.c index ac0b7eb9d..0c2896a00 100644 --- 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 2c645b8c6..dc72ca5ad 100644 --- 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 #ifdef _MSC_VER # include diff --git a/arch/x86/fill_window_sse.c b/arch/x86/fill_window_sse.c index 7d6f88d5d..91e56b269 100644 --- 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 #include "deflate.h" #include "deflate_p.h" diff --git a/arch/x86/insert_string_sse.c b/arch/x86/insert_string_sse.c index a0ae9322d..cb756ac5c 100644 --- 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 ce169ef97..6b493fda5 100644 --- 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 8883358b7..e0f9ec47f 100644 --- 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 54e84d396..13ebc8b61 100644 --- 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 e36bd7906..7c74dbe92 100644 --- 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 cfff29463..5cb073704 100644 --- 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 2cbb1e0b1..176347740 100644 --- 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 3921fc9de..d58ddbd0a 100644 --- 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 12f34c5d4..bafb774c8 100644 --- 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 7b0e136eb..946fb2b41 100644 --- 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 47f2f7525..dc4f50f82 100644 --- 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 f07dc1af3..0476d9a07 100644 --- 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 #include "gzguts.h" diff --git a/infback.c b/infback.c index 337a3ba0b..04553b72a 100644 --- 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 ca05b2f40..501a42d1f 100644 --- 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 8b3e930d4..bbab72e3e 100644 --- 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 3f4bb0189..51e85375c 100644 --- 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 a3885ccad..fd55c3e13 100644 --- 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 4fafc35e4..b31b4cb7b 100644 --- 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 diff --git a/test/minigzip.c b/test/minigzip.c index e19bda1dc..dc06c35ac 100644 --- 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 eedfdf02a..5a321b94f 100644 --- 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 77b931ca0..9f0ac2a0c 100644 --- 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 index 000000000..e2e6fc3e7 --- /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 + 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 c6b06a27e..73845eed4 100644 --- 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 778f54a24..8f741c465 100644 --- 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 - typedef SSIZE_T ssize_t; -# endif #endif #ifndef ZEXTERN diff --git a/zutil.c b/zutil.c index 70ffb84e0..84720e6c9 100644 --- a/zutil.c +++ b/zutil.c @@ -5,6 +5,7 @@ /* @(#) $Id$ */ +#include "zbuild.h" #include "zutil.h" #ifdef WITH_GZFILEOP # include "gzguts.h"