From a9107e7eb639e5b6aa066bcc29a2e575e8f1ba1b Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Fri, 16 Aug 2024 15:00:07 -0700 Subject: [PATCH] apprt/embedded: fix usingnamespace usage --- src/apprt/embedded.zig | 2 +- src/main_c.zig | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/apprt/embedded.zig b/src/apprt/embedded.zig index dc91871de..efeb2cf6f 100644 --- a/src/apprt/embedded.zig +++ b/src/apprt/embedded.zig @@ -1386,7 +1386,7 @@ pub const Inspector = struct { // C API pub const CAPI = struct { - const global = &@import("../main.zig").state; + const global = &@import("../global.zig").state; /// This is the same as Surface.KeyEvent but this is the raw C API version. const KeyEvent = extern struct { diff --git a/src/main_c.zig b/src/main_c.zig index 4cbca4899..8a66837d3 100644 --- a/src/main_c.zig +++ b/src/main_c.zig @@ -12,7 +12,8 @@ const assert = std.debug.assert; const posix = std.posix; const builtin = @import("builtin"); const build_config = @import("build_config.zig"); -const main = @import("main.zig"); +const main = @import("main_ghostty.zig"); +const state = &@import("global.zig").state; const apprt = @import("apprt.zig"); // Some comptime assertions that our C API depends on. @@ -55,7 +56,7 @@ export fn ghostty_init() c_int { var argv: [0][*:0]u8 = .{}; std.os.argv = &argv; - main.state.init() catch |err| { + state.init() catch |err| { std.log.err("failed to initialize ghostty error={}", .{err}); return 1; };