diff options
| author | s-ol <s+removethis@s-ol.nu> | 2025-09-22 15:30:57 +0000 |
|---|---|---|
| committer | s-ol <s+removethis@s-ol.nu> | 2025-09-22 15:30:57 +0000 |
| commit | be392e7bee927065e22bac70312c005af11d7bcd (patch) | |
| tree | 1a673c9e1b3a36eacb31affd8851fdd841ebce06 /src/main.zig | |
| parent | TSVSource: fix initialization in thread (diff) | |
| download | glsl-view-be392e7bee927065e22bac70312c005af11d7bcd.tar.gz glsl-view-be392e7bee927065e22bac70312c005af11d7bcd.zip | |
update for Zig 0.15.1
Diffstat (limited to 'src/main.zig')
| -rw-r--r-- | src/main.zig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main.zig b/src/main.zig index 1933e11..aeae96e 100644 --- a/src/main.zig +++ b/src/main.zig @@ -1,7 +1,7 @@ const std = @import("std"); const debug = std.debug; const panic = debug.panic; -const c = @import("c.zig"); +const c = @import("c.zig").c; const debug_gl = @import("debug_gl.zig"); const cfg = @import("config.zig"); const out = @import("output.zig"); @@ -11,7 +11,7 @@ const c_allocator = std.heap.c_allocator; var window: *c.GLFWwindow = undefined; -fn errorCallback(err: c_int, description: [*c]const u8) callconv(.C) void { +fn errorCallback(err: c_int, description: [*c]const u8) callconv(.c) void { panic("Error {}: {s}\n", .{ err, description }); } @@ -62,7 +62,7 @@ pub fn main() !void { defer constants.destroy(); var outputs = try std.ArrayList(*out.Output).initCapacity(cfg_allocator, config.outputs.len); - defer outputs.deinit(); + defer outputs.deinit(cfg_allocator); for (config.outputs) |*output_config| { outputs.appendAssumeCapacity(try out.Output.create(cfg_allocator, output_config, &constants)); } |
