mirror of
https://github.com/jart/cosmopolitan.git
synced 2025-07-03 09:48:29 +00:00
Revert "Remove zlib namespacing (#1142)"
This reverts commit 5488f0b2ca
which was a
good experiment to try, that didn't work out due to #1176
Fixes #1176
This commit is contained in:
parent
13b9ecd537
commit
2f3c6e7cc3
5 changed files with 12 additions and 16 deletions
10
third_party/zip/zipfile.c
vendored
10
third_party/zip/zipfile.c
vendored
|
@ -72,7 +72,7 @@
|
|||
#include "libc/nt/winsock.h"
|
||||
#endif
|
||||
|
||||
unsigned crc32(unsigned crc, const unsigned char *buf, unsigned len);
|
||||
unsigned _Cz_crc32(unsigned crc, const unsigned char *buf, unsigned len);
|
||||
|
||||
/*
|
||||
* XXX start of zipfile.h
|
||||
|
@ -867,7 +867,7 @@ local void read_Unicode_Path_entry(pZipListEntry)
|
|||
}
|
||||
strcpy(iname, pZipListEntry->iname);
|
||||
|
||||
chksum = crc32(chksum, (uch *)(iname), strlen(iname));
|
||||
chksum = _Cz_crc32(chksum, (uch *)(iname), strlen(iname));
|
||||
|
||||
free(iname);
|
||||
|
||||
|
@ -972,7 +972,7 @@ local void read_Unicode_Path_local_entry(pZipListEntry)
|
|||
}
|
||||
strcpy(iname, pZipListEntry->iname);
|
||||
|
||||
chksum = crc32(chksum, (uch *)(iname), strlen(iname));
|
||||
chksum = _Cz_crc32(chksum, (uch *)(iname), strlen(iname));
|
||||
|
||||
free(iname);
|
||||
|
||||
|
@ -1558,7 +1558,7 @@ local int add_Unicode_Path_local_extra_field(pZEntry)
|
|||
# define inameLocal (pZEntry->iname)
|
||||
#endif
|
||||
|
||||
chksum = crc32(chksum, (uch *)(inameLocal), strlen(inameLocal));
|
||||
chksum = _Cz_crc32(chksum, (uch *)(inameLocal), strlen(inameLocal));
|
||||
|
||||
#ifdef WIN32_OEM
|
||||
free(inameLocal);
|
||||
|
@ -1685,7 +1685,7 @@ local int add_Unicode_Path_cen_extra_field(pZEntry)
|
|||
# define inameLocal (pZEntry->iname)
|
||||
#endif
|
||||
|
||||
chksum = crc32(chksum, (uch *)(inameLocal), strlen(inameLocal));
|
||||
chksum = _Cz_crc32(chksum, (uch *)(inameLocal), strlen(inameLocal));
|
||||
|
||||
#ifdef WIN32_OEM
|
||||
free(inameLocal);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue