From f5d34e1247f78e74d94e03c9e2835204403f5e61 Mon Sep 17 00:00:00 2001 From: Stephen Gutekanst Date: Thu, 18 Aug 2022 11:22:51 -0700 Subject: [PATCH] {mach,gpu}: fix accidental inclusion of objc/message.h on non-darwin platforms Signed-off-by: Stephen Gutekanst --- gpu/examples/sample_utils.zig | 12 ++++++++---- src/platform/util.zig | 12 ++++++++---- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/gpu/examples/sample_utils.zig b/gpu/examples/sample_utils.zig index 19dd2e72..a41f869a 100644 --- a/gpu/examples/sample_utils.zig +++ b/gpu/examples/sample_utils.zig @@ -204,10 +204,16 @@ pub fn createSurfaceForWindow( }); } -pub const AutoReleasePool = opaque { +pub const AutoReleasePool = if (!@import("builtin").target.isDarwin()) opaque { pub fn init() error{OutOfMemory}!?*AutoReleasePool { - if (!@import("builtin").target.isDarwin()) return null; + return null; + } + pub fn release(pool: ?*AutoReleasePool) void { + return; + } +} else opaque { + pub fn init() error{OutOfMemory}!?*AutoReleasePool { // pool = [NSAutoreleasePool alloc]; var pool = msgSend(objc.objc_getClass("NSAutoreleasePool"), "alloc", .{}, ?*AutoReleasePool); if (pool == null) return error.OutOfMemory; @@ -220,8 +226,6 @@ pub const AutoReleasePool = opaque { } pub fn release(pool: ?*AutoReleasePool) void { - if (!@import("builtin").target.isDarwin()) return; - // [pool release]; msgSend(pool, "release", .{}, void); } diff --git a/src/platform/util.zig b/src/platform/util.zig index a4c6cddd..6e3bc236 100644 --- a/src/platform/util.zig +++ b/src/platform/util.zig @@ -137,10 +137,16 @@ pub fn createSurfaceForWindow( }); } -pub const AutoReleasePool = opaque { +pub const AutoReleasePool = if (!@import("builtin").target.isDarwin()) opaque { pub fn init() error{OutOfMemory}!?*AutoReleasePool { - if (!@import("builtin").target.isDarwin()) return null; + return null; + } + pub fn release(pool: ?*AutoReleasePool) void { + return; + } +} else opaque { + pub fn init() error{OutOfMemory}!?*AutoReleasePool { // pool = [NSAutoreleasePool alloc]; var pool = msgSend(objc.objc_getClass("NSAutoreleasePool"), "alloc", .{}, ?*AutoReleasePool); if (pool == null) return error.OutOfMemory; @@ -153,8 +159,6 @@ pub const AutoReleasePool = opaque { } pub fn release(pool: ?*AutoReleasePool) void { - if (!@import("builtin").target.isDarwin()) return; - // [pool release]; msgSend(pool, "release", .{}, void); }