kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

libarchive: Avoid using name 'hz' 

AIX system headers define the symbol 'hz' as a preprocessor macro.
This commit is contained in:
Brad King 2015-10-22 09:58:25 -04:00
parent 1bbba477c7
commit c70491d671
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Utilities/cmlibarchive/libarchive/archive_read_support_format_warc.c
View File

@ -418,9 +418,9 @@ deconst(const void *c)
} }
static char* 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 *const eon = ndl + nz;
const char *hp; const char *hp;
const char *np; 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) */ * that happens to begin with *NEEDLE) */
if (nz == 0UL) { if (nz == 0UL) {
return deconst(hay); return deconst(hay);
} else if ((hay = memchr(hay, *ndl, hz)) == NULL) { } else if ((hay = memchr(hay, *ndl, hz_)) == NULL) {
/* trivial */ /* trivial */
return NULL; return NULL;
} }