fix: compatibility with 0.15

Author: RossComputerGuy

build.zig

@@ -39,15 +39,20 @@ pub fn build(b: *std.Build) !void {
         "Install the example binaries to zig-out",
     ) orelse false;
 
+    const c_api_module = b.createModule(.{
+        .root_source_file = b.path("src/c_api.zig"),
+        .target = target,
+        .optimize = optimize,
+    });
+
     // Static C lib
     const static_lib: ?*Step.Compile = lib: {
         if (target.result.os.tag == .wasi) break :lib null;
 
-        const static_lib = b.addStaticLibrary(.{
+        const static_lib = b.addLibrary(.{
+            .linkage = .static,
             .name = "xev",
-            .root_source_file = b.path("src/c_api.zig"),
-            .target = target,
-            .optimize = optimize,
+            .root_module = c_api_module,
         });
         static_lib.linkLibC();
         if (target.result.os.tag == .windows) {
@@ -62,11 +67,10 @@ pub fn build(b: *std.Build) !void {
         // We require native so we can link to libxml2
         if (!target.query.isNative()) break :lib null;
 
-        const dynamic_lib = b.addSharedLibrary(.{
+        const dynamic_lib = b.addLibrary(.{
+            .linkage = .dynamic,
             .name = "xev",
-            .root_source_file = b.path("src/c_api.zig"),
-            .target = target,
-            .optimize = optimize,
+            .root_module = c_api_module,
         });
         break :lib dynamic_lib;
     };
@@ -115,10 +119,12 @@ pub fn build(b: *std.Build) !void {
         );
         const test_exe = b.addTest(.{
             .name = "xev-test",
-            .root_source_file = b.path("src/main.zig"),
-            .target = target,
-            .optimize = optimize,
-            .filter = test_filter,
+            .filters = if (test_filter) |filter| &.{filter} else &.{},
+            .root_module = b.createModule(.{
+                .root_source_file = b.path("src/main.zig"),
+                .target = target,
+                .optimize = optimize,
+            }),
         });
         switch (target.result.os.tag) {
             .linux, .macos => test_exe.linkLibC(),
@@ -190,12 +196,14 @@ fn buildBenchmarks(
         // Executable builder.
         const exe = b.addExecutable(.{
             .name = name,
-            .root_source_file = b.path(b.fmt(
-                "src/bench/{s}",
-                .{entry.name},
-            )),
-            .target = target,
-            .optimize = .ReleaseFast, // benchmarks are always release fast
+            .root_module = b.createModule(.{
+                .root_source_file = b.path(b.fmt(
+                    "src/bench/{s}",
+                    .{entry.name},
+                )),
+                .target = target,
+                .optimize = .ReleaseFast, // benchmarks are always release fast
+            }),
         });
         exe.root_module.addImport("xev", b.modules.get("xev").?);
 
@@ -239,21 +247,25 @@ fn buildExamples(
         const exe: *Step.Compile = if (is_zig) exe: {
             const exe = b.addExecutable(.{
                 .name = name,
-                .root_source_file = b.path(b.fmt(
-                    "examples/{s}",
-                    .{entry.name},
-                )),
-                .target = target,
-                .optimize = optimize,
+                .root_module = b.createModule(.{
+                    .root_source_file = b.path(b.fmt(
+                        "examples/{s}",
+                        .{entry.name},
+                    )),
+                    .target = target,
+                    .optimize = optimize,
+                }),
             });
             exe.root_module.addImport("xev", b.modules.get("xev").?);
             break :exe exe;
         } else exe: {
             const c_lib = c_lib_ orelse return error.UnsupportedPlatform;
             const exe = b.addExecutable(.{
                 .name = name,
-                .target = target,
-                .optimize = optimize,
+                .root_module = b.createModule(.{
+                    .target = target,
+                    .optimize = optimize,
+                }),
             });
             exe.linkLibC();
             exe.addIncludePath(b.path("include"));

src/c_api.zig

@@ -11,6 +11,11 @@ const builtin = @import("builtin");
 const assert = std.debug.assert;
 const xev = @import("main.zig");
 
+const func_callconv: std.builtin.CallingConvention = if (blk: {
+    const order = builtin.zig_version.order(.{ .major = 0, .minor = 14, .patch = 1 });
+    break :blk order == .lt or order == .eq;
+}) .C else .c;
+
 export fn xev_loop_init(loop: *xev.Loop) c_int {
     // TODO: overflow
     loop.* = xev.Loop.init(.{}) catch |err| return errorCode(err);
@@ -89,7 +94,7 @@ export fn xev_threadpool_schedule(
 
 export fn xev_threadpool_task_init(
     t: *xev.ThreadPool.Task,
-    cb: *const fn (*xev.ThreadPool.Task) callconv(.C) void,
+    cb: *const fn (*xev.ThreadPool.Task) callconv(func_callconv) void,
 ) void {
     const extern_t = @as(*Task, @ptrCast(@alignCast(t)));
     extern_t.c_callback = cb;
@@ -148,7 +153,7 @@ export fn xev_timer_run(
         *xev.Completion,
         c_int,
         ?*anyopaque,
-    ) callconv(.C) xev.CallbackAction,
+    ) callconv(func_callconv) xev.CallbackAction,
 ) void {
     const Callback = @typeInfo(@TypeOf(cb)).pointer.child;
     const extern_c = @as(*Completion, @ptrCast(@alignCast(c)));
@@ -188,7 +193,7 @@ export fn xev_timer_reset(
         *xev.Completion,
         c_int,
         ?*anyopaque,
-    ) callconv(.C) xev.CallbackAction,
+    ) callconv(func_callconv) xev.CallbackAction,
 ) void {
     const Callback = @typeInfo(@TypeOf(cb)).pointer.child;
     const extern_c = @as(*Completion, @ptrCast(@alignCast(c)));
@@ -227,7 +232,7 @@ export fn xev_timer_cancel(
         *xev.Completion,
         c_int,
         ?*anyopaque,
-    ) callconv(.C) xev.CallbackAction,
+    ) callconv(func_callconv) xev.CallbackAction,
 ) void {
     const Callback = @typeInfo(@TypeOf(cb)).pointer.child;
     const extern_c = @as(*Completion, @ptrCast(@alignCast(c_cancel)));
@@ -282,7 +287,7 @@ export fn xev_async_wait(
         *xev.Completion,
         c_int,
         ?*anyopaque,
-    ) callconv(.C) xev.CallbackAction,
+    ) callconv(func_callconv) xev.CallbackAction,
 ) void {
     const Callback = @typeInfo(@TypeOf(cb)).pointer.child;
     const extern_c = @as(*Completion, @ptrCast(@alignCast(c)));
@@ -326,7 +331,7 @@ const Completion = extern struct {
 const Task = extern struct {
     const Data = [@sizeOf(xev.ThreadPool.Task)]u8;
     data: Data,
-    c_callback: *const fn (*xev.ThreadPool.Task) callconv(.C) void,
+    c_callback: *const fn (*xev.ThreadPool.Task) callconv(func_callconv) void,
 };
 
 /// Returns the unique error code for an error.