From 17d844e7bfff01fb71ce503831f67c743bcc24a6 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Fri, 16 Aug 2024 16:39:33 -0700
Subject: [PATCH] pkg/macos: more

---
 pkg/macos/os.zig                 | 5 ++++-
 pkg/macos/os/c.zig               | 2 +-
 pkg/macos/os/log.zig             | 2 +-
 pkg/macos/video.zig              | 6 ++++--
 pkg/macos/video/c.zig            | 2 +-
 pkg/macos/video/display_link.zig | 2 +-
 6 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/pkg/macos/os.zig b/pkg/macos/os.zig
index 81ece7314..183913bac 100644
--- a/pkg/macos/os.zig
+++ b/pkg/macos/os.zig
@@ -1,5 +1,8 @@
+const log = @import("os/log.zig");
+
 pub const c = @import("os/c.zig");
-pub usingnamespace @import("os/log.zig");
+pub const Log = log.Log;
+pub const LogType = log.LogType;
 
 test {
     @import("std").testing.refAllDecls(@This());
diff --git a/pkg/macos/os/c.zig b/pkg/macos/os/c.zig
index 74cf51791..c0d88e866 100644
--- a/pkg/macos/os/c.zig
+++ b/pkg/macos/os/c.zig
@@ -1,3 +1,3 @@
-pub usingnamespace @cImport({
+pub const c = @cImport({
     @cInclude("os/log.h");
 });
diff --git a/pkg/macos/os/log.zig b/pkg/macos/os/log.zig
index 0e1b32f29..8a399b73e 100644
--- a/pkg/macos/os/log.zig
+++ b/pkg/macos/os/log.zig
@@ -1,7 +1,7 @@
 const std = @import("std");
 const assert = std.debug.assert;
 const Allocator = std.mem.Allocator;
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 
 pub const Log = opaque {
     pub fn create(
diff --git a/pkg/macos/video.zig b/pkg/macos/video.zig
index c04f5cf27..0f5cbc4d6 100644
--- a/pkg/macos/video.zig
+++ b/pkg/macos/video.zig
@@ -1,5 +1,7 @@
-pub const c = @import("video/c.zig");
-pub usingnamespace @import("video/display_link.zig");
+const display_link = @import("video/display_link.zig");
+
+pub const c = @import("video/c.zig").c;
+pub const DisplayLink = display_link.DisplayLink;
 
 test {
     @import("std").testing.refAllDecls(@This());
diff --git a/pkg/macos/video/c.zig b/pkg/macos/video/c.zig
index 46c5d9ef3..d99b1aeb6 100644
--- a/pkg/macos/video/c.zig
+++ b/pkg/macos/video/c.zig
@@ -1,3 +1,3 @@
-pub usingnamespace @cImport({
+pub const c = @cImport({
     @cInclude("CoreVideo/CoreVideo.h");
 });
diff --git a/pkg/macos/video/display_link.zig b/pkg/macos/video/display_link.zig
index 456d7f8d1..ca0c80d0b 100644
--- a/pkg/macos/video/display_link.zig
+++ b/pkg/macos/video/display_link.zig
@@ -1,7 +1,7 @@
 const std = @import("std");
 const assert = std.debug.assert;
 const Allocator = std.mem.Allocator;
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 
 pub const DisplayLink = opaque {
     pub const Error = error{