From ea73edaf7f0ba1902624b8dadd75c5ca84b3328a Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Fri, 16 Aug 2024 15:38:18 -0700
Subject: [PATCH] pkg/harfbuzz: fix c.zig

---
 pkg/harfbuzz/blob.zig     | 2 +-
 pkg/harfbuzz/buffer.zig   | 2 +-
 pkg/harfbuzz/c.zig        | 2 +-
 pkg/harfbuzz/common.zig   | 2 +-
 pkg/harfbuzz/coretext.zig | 2 +-
 pkg/harfbuzz/face.zig     | 2 +-
 pkg/harfbuzz/font.zig     | 2 +-
 pkg/harfbuzz/freetype.zig | 2 +-
 pkg/harfbuzz/main.zig     | 2 +-
 pkg/harfbuzz/shape.zig    | 2 +-
 pkg/harfbuzz/version.zig  | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkg/harfbuzz/blob.zig b/pkg/harfbuzz/blob.zig
index c4d8c5936..d25df6974 100644
--- a/pkg/harfbuzz/blob.zig
+++ b/pkg/harfbuzz/blob.zig
@@ -1,5 +1,5 @@
 const std = @import("std");
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 const Error = @import("errors.zig").Error;
 
 /// Data type holding the memory modes available to client programs.
diff --git a/pkg/harfbuzz/buffer.zig b/pkg/harfbuzz/buffer.zig
index f52385417..035120f1a 100644
--- a/pkg/harfbuzz/buffer.zig
+++ b/pkg/harfbuzz/buffer.zig
@@ -1,5 +1,5 @@
 const std = @import("std");
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 const common = @import("common.zig");
 const Error = @import("errors.zig").Error;
 const Direction = common.Direction;
diff --git a/pkg/harfbuzz/c.zig b/pkg/harfbuzz/c.zig
index 9f8790fe5..51e477ebf 100644
--- a/pkg/harfbuzz/c.zig
+++ b/pkg/harfbuzz/c.zig
@@ -1,6 +1,6 @@
 const builtin = @import("builtin");
 
-pub usingnamespace @cImport({
+pub const c = @cImport({
     @cInclude("hb.h");
     @cInclude("hb-ft.h");
     if (builtin.os.tag == .macos) @cInclude("hb-coretext.h");
diff --git a/pkg/harfbuzz/common.zig b/pkg/harfbuzz/common.zig
index 7ecea502c..840ff5868 100644
--- a/pkg/harfbuzz/common.zig
+++ b/pkg/harfbuzz/common.zig
@@ -1,5 +1,5 @@
 const std = @import("std");
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 
 /// The direction of a text segment or buffer.
 ///
diff --git a/pkg/harfbuzz/coretext.zig b/pkg/harfbuzz/coretext.zig
index 4253feddb..73042624c 100644
--- a/pkg/harfbuzz/coretext.zig
+++ b/pkg/harfbuzz/coretext.zig
@@ -1,6 +1,6 @@
 const macos = @import("macos");
 const std = @import("std");
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 const Face = @import("face.zig").Face;
 const Font = @import("font.zig").Font;
 const Error = @import("errors.zig").Error;
diff --git a/pkg/harfbuzz/face.zig b/pkg/harfbuzz/face.zig
index 2fd3605e8..5ffad5d3e 100644
--- a/pkg/harfbuzz/face.zig
+++ b/pkg/harfbuzz/face.zig
@@ -1,5 +1,5 @@
 const std = @import("std");
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 
 /// A font face is an object that represents a single face from within a font family.
 ///
diff --git a/pkg/harfbuzz/font.zig b/pkg/harfbuzz/font.zig
index 0947ea0b2..13544fb9f 100644
--- a/pkg/harfbuzz/font.zig
+++ b/pkg/harfbuzz/font.zig
@@ -1,5 +1,5 @@
 const std = @import("std");
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 const Face = @import("face.zig").Face;
 const Error = @import("errors.zig").Error;
 
diff --git a/pkg/harfbuzz/freetype.zig b/pkg/harfbuzz/freetype.zig
index 570403061..d90d3f83c 100644
--- a/pkg/harfbuzz/freetype.zig
+++ b/pkg/harfbuzz/freetype.zig
@@ -1,6 +1,6 @@
 const freetype = @import("freetype");
 const std = @import("std");
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 const Face = @import("face.zig").Face;
 const Font = @import("font.zig").Font;
 const Error = @import("errors.zig").Error;
diff --git a/pkg/harfbuzz/main.zig b/pkg/harfbuzz/main.zig
index 6cbb1b2c3..988ca8fc9 100644
--- a/pkg/harfbuzz/main.zig
+++ b/pkg/harfbuzz/main.zig
@@ -1,4 +1,4 @@
-pub const c = @import("c.zig");
+pub const c = @import("c.zig").c;
 pub usingnamespace @import("blob.zig");
 pub usingnamespace @import("buffer.zig");
 pub usingnamespace @import("common.zig");
diff --git a/pkg/harfbuzz/shape.zig b/pkg/harfbuzz/shape.zig
index be197e5de..b49020c3c 100644
--- a/pkg/harfbuzz/shape.zig
+++ b/pkg/harfbuzz/shape.zig
@@ -1,5 +1,5 @@
 const std = @import("std");
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 const Font = @import("font.zig").Font;
 const Buffer = @import("buffer.zig").Buffer;
 const Feature = @import("common.zig").Feature;
diff --git a/pkg/harfbuzz/version.zig b/pkg/harfbuzz/version.zig
index 0773e22fd..dbe25b522 100644
--- a/pkg/harfbuzz/version.zig
+++ b/pkg/harfbuzz/version.zig
@@ -1,5 +1,5 @@
 const std = @import("std");
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 
 pub const Version = struct {
     major: u32,