diff --git a/pkg/harfbuzz/blob.zig b/pkg/harfbuzz/blob.zig --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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,