update for Zig 0.15.1

12 files changed, 21 insertions, 21 deletions

diff --git a/src/c.zig b/src/c.zig
index 1618030..3771396 100644
--- a/src/c.zig
+++ b/src/c.zig
@@ -1,6 +1,6 @@
 const build_config = @import("build_config");
 
-pub usingnamespace @cImport({
+pub const c = @cImport({
     @cInclude("epoxy/gl.h");
     @cInclude("GLFW/glfw3.h");
     @cInclude("lo/lo.h");
diff --git a/src/control.zig b/src/control.zig
index 10aa43c..f547a4b 100644
--- a/src/control.zig
+++ b/src/control.zig
@@ -1,5 +1,5 @@
 const std = @import("std");
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 const gl = @import("gl.zig");
 const src = @import("source.zig");
 const cfg = @import("config.zig");
@@ -160,7 +160,7 @@ pub const ControlServer = struct {
                 argc: c_int,
                 msg: c.lo_message,
                 userdata: ?*anyopaque,
-            ) callconv(.C) c_int {
+            ) callconv(.c) c_int {
                 const i_self: *Self = @ptrCast(@alignCast(userdata.?));
                 const i_path = std.mem.span(_path.?);
                 const i_types = std.mem.span(_types.?);
@@ -199,7 +199,7 @@ pub const ControlServer = struct {
         self.sources.deinit();
     }
 
-    fn handle_error(num: c_int, msg: [*c]const u8, where: [*c]const u8) callconv(.C) void {
+    fn handle_error(num: c_int, msg: [*c]const u8, where: [*c]const u8) callconv(.c) void {
         std.debug.print(
             "OSC error {} @ {?s}: {?s}\n",
             .{ num, @as(?[*:0]const u8, @ptrCast(where)), @as(?[*:0]const u8, @ptrCast(msg)) },
diff --git a/src/debug_gl.zig b/src/debug_gl.zig
index 4a14591..dbb7d3f 100644
--- a/src/debug_gl.zig
+++ b/src/debug_gl.zig
@@ -1,4 +1,4 @@
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 const std = @import("std");
 const os = std.os;
 const panic = std.debug.panic;
@@ -14,7 +14,7 @@ fn glDebugMessage(
     length: c.GLsizei,
     _message: [*c]const u8,
     user: ?*const anyopaque,
-) callconv(.C) void {
+) callconv(.c) void {
     _ = id;
     _ = user;
 
diff --git a/src/ffmpeg.zig b/src/ffmpeg.zig
index 700638f..fdf9068 100644
--- a/src/ffmpeg.zig
+++ b/src/ffmpeg.zig
@@ -1,5 +1,5 @@
 const std = @import("std");
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 const gl = @import("gl.zig");
 const src = @import("source.zig");
 const ctrl = @import("control.zig");
diff --git a/src/gl.zig b/src/gl.zig
index 724340e..bd43b5b 100644
--- a/src/gl.zig
+++ b/src/gl.zig
@@ -1,6 +1,6 @@
 const std = @import("std");
 const c_allocator = @import("std").heap.c_allocator;
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 const cfg = @import("config.zig");
 const util = @import("util.zig");
 
diff --git a/src/hap.zig b/src/hap.zig
index c2db8bb..7a2dd50 100644
--- a/src/hap.zig
+++ b/src/hap.zig
@@ -1,5 +1,5 @@
 const std = @import("std");
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 const gl = @import("gl.zig");
 const ffmpeg = @import("ffmpeg.zig");
 
@@ -63,7 +63,7 @@ pub const HAPDecoder = struct {
         p: ?*anyopaque,
         count: c_uint,
         info: ?*anyopaque,
-    ) callconv(.C) void {
+    ) callconv(.c) void {
         _ = info;
 
         var i: c_uint = 0;
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));
     }
diff --git a/src/output.zig b/src/output.zig
index c236f4a..87dc311 100644
--- a/src/output.zig
+++ b/src/output.zig
@@ -1,5 +1,5 @@
 const std = @import("std");
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 const build_config = @import("build_config");
 const cfg = @import("config.zig");
 const gl = @import("gl.zig");
@@ -158,7 +158,7 @@ pub const WindowOutput = struct {
         scancode: c_int,
         action: c_int,
         mods: c_int,
-    ) callconv(.C) void {
+    ) callconv(.c) void {
         if (action != c.GLFW_PRESS) return;
         const userptr = c.glfwGetWindowUserPointer(win).?;
         const self = @as(*WindowOutput, @ptrCast(@alignCast(userptr)));
@@ -175,7 +175,7 @@ pub const WindowOutput = struct {
         }
     }
 
-    fn sizeCallback(win: ?*c.GLFWwindow, width: c_int, height: c_int) callconv(.C) void {
+    fn sizeCallback(win: ?*c.GLFWwindow, width: c_int, height: c_int) callconv(.c) void {
         const userptr = c.glfwGetWindowUserPointer(win).?;
         const self = @as(*WindowOutput, @ptrCast(@alignCast(userptr)));
         self.resized = true;
diff --git a/src/source.zig b/src/source.zig
index 96ba878..21e82c8 100644
--- a/src/source.zig
+++ b/src/source.zig
@@ -1,5 +1,5 @@
 const std = @import("std");
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 const gl = @import("gl.zig");
 const ctrl = @import("control.zig");
 const util = @import("util.zig");
diff --git a/src/tsv.zig b/src/tsv.zig
index 2f44c65..ae052d4 100644
--- a/src/tsv.zig
+++ b/src/tsv.zig
@@ -1,5 +1,5 @@
 const std = @import("std");
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 const gl = @import("gl.zig");
 const src = @import("source.zig");
 const ctrl = @import("control.zig");
diff --git a/src/util.zig b/src/util.zig
index e168326..a73a8ce 100644
--- a/src/util.zig
+++ b/src/util.zig
@@ -7,12 +7,12 @@ var fba = std.heap.FixedBufferAllocator.init(state.buf[0..]);
 
 pub fn tmpZ(str: []const u8) ![:0]const u8 {
     fba.reset();
-    return try std.fmt.allocPrintZ(fba.allocator(), "{s}", .{str});
+    return try std.fmt.allocPrintSentinel(fba.allocator(), "{s}", .{str}, 0);
 }
 
 pub fn tmpFmtZ(comptime fmt: []const u8, args: anytype) ![:0]const u8 {
     fba.reset();
-    return try std.fmt.allocPrintZ(fba.allocator(), fmt, args);
+    return try std.fmt.allocPrintSentinel(fba.allocator(), fmt, args, 0);
 }
 
 pub fn tmpJoinZ(separator: []const u8, slices: []const []const u8) ![:0]const u8 {
diff --git a/src/yaml.zig b/src/yaml.zig
index 36e1770..f98a8cb 100644
--- a/src/yaml.zig
+++ b/src/yaml.zig
@@ -1,4 +1,4 @@
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 const std = @import("std");
 const debug = @import("std").debug;