From c169ac82bc957ce1f1ba863982a8249873fb572c Mon Sep 17 00:00:00 2001 From: D-Berg Date: Sun, 17 Nov 2024 16:13:54 +0100 Subject: [PATCH 1/2] fixes some compiler errors for darwin in #21094 --- lib/std/c/darwin.zig | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/std/c/darwin.zig b/lib/std/c/darwin.zig index b925a15942e1..18b1b6e814e3 100644 --- a/lib/std/c/darwin.zig +++ b/lib/std/c/darwin.zig @@ -946,13 +946,13 @@ pub const OS_LOG_CATEGORY_POINTS_OF_INTEREST: *const u8 = "PointsOfInterest"; pub const OS_LOG_CATEGORY_DYNAMIC_TRACING: *const u8 = "DynamicTracing"; pub const OS_LOG_CATEGORY_DYNAMIC_STACK_TRACING: *const u8 = "DynamicStackTracing"; -pub extern "c" fn os_log_create(subsystem: [*]const u8, category: [*]const u8) os_log_t; -pub extern "c" fn os_log_type_enabled(log: os_log_t, tpe: os_log_type_t) bool; -pub extern "c" fn os_signpost_id_generate(log: os_log_t) os_signpost_id_t; -pub extern "c" fn os_signpost_interval_begin(log: os_log_t, signpos: os_signpost_id_t, func: [*]const u8, ...) void; -pub extern "c" fn os_signpost_interval_end(log: os_log_t, signpos: os_signpost_id_t, func: [*]const u8, ...) void; -pub extern "c" fn os_signpost_id_make_with_pointer(log: os_log_t, ptr: ?*anyopaque) os_signpost_id_t; -pub extern "c" fn os_signpost_enabled(log: os_log_t) bool; +pub extern "c" fn os_log_create(subsystem: [*]const u8, category: [*]const u8) *os_log_t; +pub extern "c" fn os_log_type_enabled(log: *os_log_t, tpe: os_log_type_t) bool; +pub extern "c" fn os_signpost_id_generate(log: *os_log_t) os_signpost_id_t; +pub extern "c" fn os_signpost_interval_begin(log: *os_log_t, signpos: os_signpost_id_t, func: [*]const u8, ...) void; +pub extern "c" fn os_signpost_interval_end(log: *os_log_t, signpos: os_signpost_id_t, func: [*]const u8, ...) void; +pub extern "c" fn os_signpost_id_make_with_pointer(log: *os_log_t, ptr: ?*anyopaque) os_signpost_id_t; +pub extern "c" fn os_signpost_enabled(log: *os_log_t) bool; pub extern "c" fn pthread_setname_np(name: [*:0]const u8) c_int; pub extern "c" fn pthread_attr_set_qos_class_np(attr: *pthread_attr_t, qos_class: qos_class_t, relative_priority: c_int) c_int; From fdc6dab4841a10872584190c7b2b2af48d383b2d Mon Sep 17 00:00:00 2001 From: D-Berg Date: Mon, 18 Nov 2024 09:31:39 +0100 Subject: [PATCH 2/2] updates PR with suggestion of changing os_log_t to *opaque --- lib/std/c/darwin.zig | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/std/c/darwin.zig b/lib/std/c/darwin.zig index 18b1b6e814e3..ef128beaebe0 100644 --- a/lib/std/c/darwin.zig +++ b/lib/std/c/darwin.zig @@ -928,7 +928,7 @@ pub const OS_SIGNPOST_ID_NULL: os_signpost_id_t = 0; pub const OS_SIGNPOST_ID_INVALID: os_signpost_id_t = !0; pub const OS_SIGNPOST_ID_EXCLUSIVE: os_signpost_id_t = 0xeeeeb0b5b2b2eeee; -pub const os_log_t = opaque {}; +pub const os_log_t = *opaque {}; pub const os_log_type_t = enum(u8) { /// default messages always captures OS_LOG_TYPE_DEFAULT = 0x00, @@ -946,13 +946,13 @@ pub const OS_LOG_CATEGORY_POINTS_OF_INTEREST: *const u8 = "PointsOfInterest"; pub const OS_LOG_CATEGORY_DYNAMIC_TRACING: *const u8 = "DynamicTracing"; pub const OS_LOG_CATEGORY_DYNAMIC_STACK_TRACING: *const u8 = "DynamicStackTracing"; -pub extern "c" fn os_log_create(subsystem: [*]const u8, category: [*]const u8) *os_log_t; -pub extern "c" fn os_log_type_enabled(log: *os_log_t, tpe: os_log_type_t) bool; -pub extern "c" fn os_signpost_id_generate(log: *os_log_t) os_signpost_id_t; -pub extern "c" fn os_signpost_interval_begin(log: *os_log_t, signpos: os_signpost_id_t, func: [*]const u8, ...) void; -pub extern "c" fn os_signpost_interval_end(log: *os_log_t, signpos: os_signpost_id_t, func: [*]const u8, ...) void; -pub extern "c" fn os_signpost_id_make_with_pointer(log: *os_log_t, ptr: ?*anyopaque) os_signpost_id_t; -pub extern "c" fn os_signpost_enabled(log: *os_log_t) bool; +pub extern "c" fn os_log_create(subsystem: [*]const u8, category: [*]const u8) os_log_t; +pub extern "c" fn os_log_type_enabled(log: os_log_t, tpe: os_log_type_t) bool; +pub extern "c" fn os_signpost_id_generate(log: os_log_t) os_signpost_id_t; +pub extern "c" fn os_signpost_interval_begin(log: os_log_t, signpos: os_signpost_id_t, func: [*]const u8, ...) void; +pub extern "c" fn os_signpost_interval_end(log: os_log_t, signpos: os_signpost_id_t, func: [*]const u8, ...) void; +pub extern "c" fn os_signpost_id_make_with_pointer(log: os_log_t, ptr: ?*anyopaque) os_signpost_id_t; +pub extern "c" fn os_signpost_enabled(log: os_log_t) bool; pub extern "c" fn pthread_setname_np(name: [*:0]const u8) c_int; pub extern "c" fn pthread_attr_set_qos_class_np(attr: *pthread_attr_t, qos_class: qos_class_t, relative_priority: c_int) c_int;