From 6bcced31a04afeeead065af961f2571a95e4ad21 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Tue, 29 Jul 2025 16:18:52 -0700 Subject: [PATCH] fix 32-bit compilation --- lib/std/compress/flate/Decompress.zig | 4 ++-- lib/std/zip.zig | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/std/compress/flate/Decompress.zig b/lib/std/compress/flate/Decompress.zig index 57903ba751..ffbaf156f6 100644 --- a/lib/std/compress/flate/Decompress.zig +++ b/lib/std/compress/flate/Decompress.zig @@ -457,7 +457,7 @@ fn specialPeek(in: *Reader, next_bits: usize, i: usize) Reader.Error!u8 { return peeked[i]; } -fn tossBits(d: *Decompress, n: u6) !void { +fn tossBits(d: *Decompress, n: u4) !void { const remaining_bits = d.remaining_bits; const next_bits = d.next_bits; if (remaining_bits >= n) { @@ -475,7 +475,7 @@ fn tossBits(d: *Decompress, n: u6) !void { } } -fn tossBitsEnding(d: *Decompress, n: u6) !void { +fn tossBitsEnding(d: *Decompress, n: u4) !void { const remaining_bits = d.remaining_bits; const in = d.input; const buffered_n = in.bufferedLen(); diff --git a/lib/std/zip.zig b/lib/std/zip.zig index b0da6ac266..ce2a5c43ae 100644 --- a/lib/std/zip.zig +++ b/lib/std/zip.zig @@ -577,7 +577,7 @@ pub const Iterator = struct { switch (self.compression_method) { .store => { - stream.interface.streamExact(&file_writer.interface, self.uncompressed_size) catch |err| switch (err) { + stream.interface.streamExact64(&file_writer.interface, self.uncompressed_size) catch |err| switch (err) { error.ReadFailed => return stream.err.?, error.WriteFailed => return file_writer.err.?, error.EndOfStream => return error.ZipDecompressTruncated, @@ -586,7 +586,7 @@ pub const Iterator = struct { .deflate => { var flate_buffer: [flate.max_window_len]u8 = undefined; var decompress: flate.Decompress = .init(&stream.interface, .raw, &flate_buffer); - decompress.reader.streamExact(&file_writer.interface, self.uncompressed_size) catch |err| switch (err) { + decompress.reader.streamExact64(&file_writer.interface, self.uncompressed_size) catch |err| switch (err) { error.ReadFailed => return stream.err.?, error.WriteFailed => return file_writer.err orelse decompress.err.?, error.EndOfStream => return error.ZipDecompressTruncated,