-
-
Notifications
You must be signed in to change notification settings - Fork 4
/
Copy pathchromium-97-compilefixes.patch
48 lines (45 loc) · 2.34 KB
/
chromium-97-compilefixes.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
diff -up chromium-97.0.4682.3/third_party/zlib/google/zip_internal.cc.omv~ chromium-97.0.4682.3/third_party/zlib/google/zip_internal.cc
--- chromium-97.0.4682.3/third_party/zlib/google/zip_internal.cc.omv~ 2021-11-02 22:51:01.799596700 +0100
+++ chromium-97.0.4682.3/third_party/zlib/google/zip_internal.cc 2021-11-02 22:52:16.428670047 +0100
@@ -177,7 +177,7 @@ void* OpenZipBuffer(void* opaque, const
// Reads compressed data from the specified stream. This function copies data
// refered by the opaque parameter and returns the size actually copied.
-uLong ReadZipBuffer(void* opaque, void* /*stream*/, void* buf, uLong size) {
+unsigned long ReadZipBuffer(void* opaque, void* /*stream*/, void* buf, unsigned long size) {
ZipBuffer* buffer = static_cast<ZipBuffer*>(opaque);
DCHECK_LE(buffer->offset, buffer->length);
ZPOS64_T remaining_bytes = buffer->length - buffer->offset;
@@ -192,10 +192,10 @@ uLong ReadZipBuffer(void* opaque, void*
// Writes compressed data to the stream. This function always returns zero
// because this implementation is only for reading compressed data.
-uLong WriteZipBuffer(void* /*opaque*/,
+unsigned long WriteZipBuffer(void* /*opaque*/,
void* /*stream*/,
const void* /*buf*/,
- uLong /*size*/) {
+ unsigned long /*size*/) {
NOTREACHED();
return 0;
}
@@ -357,7 +357,7 @@ bool ZipOpenNewFileInZip(zipFile zip_fil
Compression compression) {
// Section 4.4.4 http://www.pkware.com/documents/casestudies/APPNOTE.TXT
// Setting the Language encoding flag so the file is told to be in utf-8.
- const uLong LANGUAGE_ENCODING_FLAG = 0x1 << 11;
+ const unsigned long LANGUAGE_ENCODING_FLAG = 0x1 << 11;
const zip_fileinfo file_info = TimeToZipFileInfo(last_modified_time);
const int err = zipOpenNewFileInZip4_64(
@@ -370,11 +370,11 @@ bool ZipOpenNewFileInZip(zipFile zip_fil
/*size_extrafield_global=*/0u,
/*comment=*/nullptr,
/*method=*/compression,
- /*level=*/Z_DEFAULT_COMPRESSION,
+ /*level=*/-1 /*Z_DEFAULT_COMPRESSION*/,
/*raw=*/0,
/*windowBits=*/-MAX_WBITS,
/*memLevel=*/DEF_MEM_LEVEL,
- /*strategy=*/Z_DEFAULT_STRATEGY,
+ /*strategy=*/0 /*Z_DEFAULT_STRATEGY*/,
/*password=*/nullptr,
/*crcForCrypting=*/0,
/*versionMadeBy=*/0,