mirror of
https://codeberg.org/ziglang/zig.git
synced 2025-12-06 05:44:20 +00:00
resinator: Sync with upstream, fix an alignment problem
This commit is contained in:
parent
fc59870e3b
commit
c50aa2b95c
2 changed files with 3 additions and 5 deletions
|
|
@ -695,7 +695,7 @@ pub const Compiler = struct {
|
|||
}
|
||||
|
||||
try file_reader.seekTo(entry.data_offset_from_start_of_file);
|
||||
var header_bytes = (file_reader.interface.takeArray(16) catch {
|
||||
var header_bytes: [16]u8 align(@alignOf(ico.BitmapHeader)) = (file_reader.interface.takeArray(16) catch {
|
||||
return self.iconReadError(
|
||||
error.UnexpectedEOF,
|
||||
filename_utf8,
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ pub fn preprocess(
|
|||
var driver: aro.Driver = .{ .comp = comp, .diagnostics = comp.diagnostics, .aro_name = "arocc" };
|
||||
defer driver.deinit();
|
||||
|
||||
var macro_buf: std.ArrayListUnmanaged(u8) = .empty;
|
||||
var macro_buf: std.ArrayList(u8) = .empty;
|
||||
defer macro_buf.deinit(comp.gpa);
|
||||
|
||||
var discard_buffer: [64]u8 = undefined;
|
||||
|
|
@ -66,9 +66,7 @@ pub fn preprocess(
|
|||
|
||||
if (hasAnyErrors(comp)) return error.PreprocessError;
|
||||
|
||||
pp.prettyPrintTokens(writer, .result_only) catch |err| switch (err) {
|
||||
error.WriteFailed => return error.OutOfMemory,
|
||||
};
|
||||
try pp.prettyPrintTokens(writer, .result_only);
|
||||
|
||||
if (maybe_dependencies) |dependencies| {
|
||||
for (comp.sources.values()) |comp_source| {
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue