From: cielavenir Date: Fri, 16 Aug 2019 17:18:25 +0000 (+0900) Subject: use relative header path X-Git-Tag: 1.9.9-b1~451 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3030e21e5eccd99173286c93d233a3a4b4d2603d;p=thirdparty%2Fzlib-ng.git use relative header path --- diff --git a/arch/arm/adler32_neon.c b/arch/arm/adler32_neon.c index 3e0ee4dd..bc77672e 100644 --- a/arch/arm/adler32_neon.c +++ b/arch/arm/adler32_neon.c @@ -19,7 +19,7 @@ #include "adler32_neon.h" #if defined(__ARM_NEON__) || defined(__ARM_NEON) #include -#include "adler32_p.h" +#include "../../adler32_p.h" static void NEON_accum32(uint32_t *s, const unsigned char *buf, size_t len) { static const uint8_t taps[32] = { diff --git a/arch/arm/armfeature.c b/arch/arm/armfeature.c index f7ccdc46..0cec748c 100644 --- a/arch/arm/armfeature.c +++ b/arch/arm/armfeature.c @@ -1,4 +1,4 @@ -#include "zutil.h" +#include "../../zutil.h" #if defined(__linux__) # include diff --git a/arch/arm/fill_window_arm.c b/arch/arm/fill_window_arm.c index c9f042a0..571585ba 100644 --- a/arch/arm/fill_window_arm.c +++ b/arch/arm/fill_window_arm.c @@ -10,10 +10,10 @@ /* @(#) $Id$ */ -#include "zbuild.h" -#include "deflate.h" -#include "deflate_p.h" -#include "functable.h" +#include "../../zbuild.h" +#include "../../deflate.h" +#include "../../deflate_p.h" +#include "../../functable.h" extern ZLIB_INTERNAL int read_buf(PREFIX3(stream) *strm, unsigned char *buf, unsigned size); diff --git a/arch/arm/insert_string_acle.c b/arch/arm/insert_string_acle.c index 081b936c..2b306fed 100644 --- a/arch/arm/insert_string_acle.c +++ b/arch/arm/insert_string_acle.c @@ -7,8 +7,8 @@ #if defined(__ARM_FEATURE_CRC32) && defined(ARM_ACLE_CRC_HASH) #include -#include "zbuild.h" -#include "deflate.h" +#include "../../zbuild.h" +#include "../../deflate.h" /* =========================================================================== * Insert string str in the dictionary and set match_head to the previous head diff --git a/arch/s390/dfltcc_common.c b/arch/s390/dfltcc_common.c index 91a242f5..c662f1de 100644 --- a/arch/s390/dfltcc_common.c +++ b/arch/s390/dfltcc_common.c @@ -1,6 +1,6 @@ /* dfltcc_deflate.c - IBM Z DEFLATE CONVERSION CALL general support. */ -#include "zbuild.h" +#include "../../zbuild.h" #include "dfltcc_common.h" #include "dfltcc_detail.h" diff --git a/arch/s390/dfltcc_common.h b/arch/s390/dfltcc_common.h index e206e043..1b153c8a 100644 --- a/arch/s390/dfltcc_common.h +++ b/arch/s390/dfltcc_common.h @@ -2,11 +2,11 @@ #define DFLTCC_COMMON_H #ifdef ZLIB_COMPAT -#include "zlib.h" +#include "../../zlib.h" #else -#include "zlib-ng.h" +#include "../../zlib-ng.h" #endif -#include "zutil.h" +#include "../../zutil.h" void ZLIB_INTERNAL *dfltcc_alloc_state(PREFIX3(streamp) strm, uInt items, uInt size); void ZLIB_INTERNAL dfltcc_copy_state(void *dst, const void *src, uInt size); diff --git a/arch/s390/dfltcc_deflate.c b/arch/s390/dfltcc_deflate.c index e164d987..ae3a2862 100644 --- a/arch/s390/dfltcc_deflate.c +++ b/arch/s390/dfltcc_deflate.c @@ -13,9 +13,9 @@ $ make */ -#include "zbuild.h" -#include "zutil.h" -#include "deflate.h" +#include "../../zbuild.h" +#include "../../zutil.h" +#include "../../deflate.h" #include "dfltcc_deflate.h" #include "dfltcc_detail.h" diff --git a/arch/s390/dfltcc_inflate.c b/arch/s390/dfltcc_inflate.c index cec25f41..4bd73719 100644 --- a/arch/s390/dfltcc_inflate.c +++ b/arch/s390/dfltcc_inflate.c @@ -13,10 +13,10 @@ $ make */ -#include "zbuild.h" -#include "zutil.h" -#include "inftrees.h" -#include "inflate.h" +#include "../../zbuild.h" +#include "../../zutil.h" +#include "../../inftrees.h" +#include "../../inflate.h" #include "dfltcc_inflate.h" #include "dfltcc_detail.h" diff --git a/arch/x86/crc_folding.c b/arch/x86/crc_folding.c index eb178f55..e86b4493 100644 --- a/arch/x86/crc_folding.c +++ b/arch/x86/crc_folding.c @@ -18,7 +18,7 @@ #ifdef X86_PCLMULQDQ_CRC -#include "zbuild.h" +#include "../../zbuild.h" #include #include #include diff --git a/arch/x86/crc_folding.h b/arch/x86/crc_folding.h index 22bfa986..71b84533 100644 --- a/arch/x86/crc_folding.h +++ b/arch/x86/crc_folding.h @@ -10,7 +10,7 @@ #ifndef CRC_FOLDING_H_ #define CRC_FOLDING_H_ -#include "deflate.h" +#include "../../deflate.h" ZLIB_INTERNAL void crc_fold_init(deflate_state *const); ZLIB_INTERNAL uint32_t crc_fold_512to32(deflate_state *const); diff --git a/arch/x86/deflate_quick.c b/arch/x86/deflate_quick.c index 199ec734..ce1f52f5 100644 --- a/arch/x86/deflate_quick.c +++ b/arch/x86/deflate_quick.c @@ -17,13 +17,13 @@ * For conditions of distribution and use, see copyright notice in zlib.h */ -#include "zbuild.h" +#include "../../zbuild.h" #include #ifdef _MSC_VER # include #endif -#include "deflate.h" -#include "memcopy.h" +#include "../../deflate.h" +#include "../../memcopy.h" #ifdef ZLIB_DEBUG #include diff --git a/arch/x86/fill_window_sse.c b/arch/x86/fill_window_sse.c index 1c0f863b..e543b5d9 100644 --- a/arch/x86/fill_window_sse.c +++ b/arch/x86/fill_window_sse.c @@ -10,11 +10,11 @@ */ #ifdef X86_SSE2 -#include "zbuild.h" +#include "../../zbuild.h" #include -#include "deflate.h" -#include "deflate_p.h" -#include "functable.h" +#include "../../deflate.h" +#include "../../deflate_p.h" +#include "../../functable.h" extern int read_buf(PREFIX3(stream) *strm, unsigned char *buf, unsigned size); diff --git a/arch/x86/insert_string_sse.c b/arch/x86/insert_string_sse.c index 59962151..b084a949 100644 --- a/arch/x86/insert_string_sse.c +++ b/arch/x86/insert_string_sse.c @@ -5,8 +5,8 @@ * */ -#include "zbuild.h" -#include "deflate.h" +#include "../../zbuild.h" +#include "../../deflate.h" /* =========================================================================== * Insert string str in the dictionary and set match_head to the previous head diff --git a/arch/x86/x86.c b/arch/x86/x86.c index 382f72a2..af893646 100644 --- a/arch/x86/x86.c +++ b/arch/x86/x86.c @@ -8,7 +8,7 @@ * For conditions of distribution and use, see copyright notice in zlib.h */ -#include "zutil.h" +#include "../../zutil.h" #ifdef _MSC_VER #include