From c70491d671b363b50a41d707d5fe82b02fe29424 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 22 Oct 2015 09:58:25 -0400 Subject: [PATCH] libarchive: Avoid using name 'hz' AIX system headers define the symbol 'hz' as a preprocessor macro. --- .../libarchive/archive_read_support_format_warc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Utilities/cmlibarchive/libarchive/archive_read_support_format_warc.c b/Utilities/cmlibarchive/libarchive/archive_read_support_format_warc.c index 6bd15f6b7a..57534f3f68 100644 --- a/Utilities/cmlibarchive/libarchive/archive_read_support_format_warc.c +++ b/Utilities/cmlibarchive/libarchive/archive_read_support_format_warc.c @@ -418,9 +418,9 @@ deconst(const void *c) } static char* -xmemmem(const char *hay, const size_t hz, const char *ndl, const size_t nz) +xmemmem(const char *hay, const size_t hz_, const char *ndl, const size_t nz) { - const char *const eoh = hay + hz; + const char *const eoh = hay + hz_; const char *const eon = ndl + nz; const char *hp; const char *np; @@ -435,7 +435,7 @@ xmemmem(const char *hay, const size_t hz, const char *ndl, const size_t nz) * that happens to begin with *NEEDLE) */ if (nz == 0UL) { return deconst(hay); - } else if ((hay = memchr(hay, *ndl, hz)) == NULL) { + } else if ((hay = memchr(hay, *ndl, hz_)) == NULL) { /* trivial */ return NULL; }