diff options
| author | Brad King <brad.king@kitware.com> | 2015-10-22 13:58:25 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-10-22 14:18:27 (GMT) |
| commit | c70491d671b363b50a41d707d5fe82b02fe29424 (patch) | |
| tree | f54aa3cb286e8ed24877dce5a392b4cd646dbd70 /Utilities/cmlibarchive | |
| parent | 1bbba477c747581d318b4fe5a1f3ede36301eed7 (diff) | |
| download | CMake-c70491d671b363b50a41d707d5fe82b02fe29424.zip CMake-c70491d671b363b50a41d707d5fe82b02fe29424.tar.gz CMake-c70491d671b363b50a41d707d5fe82b02fe29424.tar.bz2 | |
libarchive: Avoid using name 'hz'
AIX system headers define the symbol 'hz' as a preprocessor macro.
Diffstat (limited to 'Utilities/cmlibarchive')
| -rw-r--r-- | Utilities/cmlibarchive/libarchive/archive_read_support_format_warc.c | 6 |
1 files 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 6bd15f6..57534f3 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; } |