diff --git a/pkg/freetype/Library.zig b/pkg/freetype/Library.zig index f5dc606ef..1cff79210 100644 --- a/pkg/freetype/Library.zig +++ b/pkg/freetype/Library.zig @@ -1,7 +1,7 @@ const Library = @This(); const std = @import("std"); -const c = @import("c.zig"); +const c = @import("c.zig").c; const Face = @import("face.zig").Face; const errors = @import("errors.zig"); const Error = errors.Error; diff --git a/pkg/freetype/c.zig b/pkg/freetype/c.zig index 8a00bba2b..9431abeb6 100644 --- a/pkg/freetype/c.zig +++ b/pkg/freetype/c.zig @@ -1,3 +1,3 @@ -pub usingnamespace @cImport({ +pub const c = @cImport({ @cInclude("freetype-zig.h"); }); diff --git a/pkg/freetype/computations.zig b/pkg/freetype/computations.zig index 82a95cdeb..fc9b2ccb2 100644 --- a/pkg/freetype/computations.zig +++ b/pkg/freetype/computations.zig @@ -1,5 +1,5 @@ const std = @import("std"); -const c = @import("c.zig"); +const c = @import("c.zig").c; /// Compute (a*b)/0x10000 with maximum accuracy. Its main use is to multiply /// a given value by a 16.16 fixed-point factor. diff --git a/pkg/freetype/errors.zig b/pkg/freetype/errors.zig index 3fe6dccb8..9eddc0575 100644 --- a/pkg/freetype/errors.zig +++ b/pkg/freetype/errors.zig @@ -1,4 +1,4 @@ -const c = @import("c.zig"); +const c = @import("c.zig").c; // Thanks to Mach (https://github.com/hexops/mach) for this work, I didn't // do this manually. I wrote the other Freetype bindings by hand but this diff --git a/pkg/freetype/face.zig b/pkg/freetype/face.zig index 94c3e2931..2724aba40 100644 --- a/pkg/freetype/face.zig +++ b/pkg/freetype/face.zig @@ -1,6 +1,6 @@ const std = @import("std"); const Allocator = std.mem.Allocator; -const c = @import("c.zig"); +const c = @import("c.zig").c; const errors = @import("errors.zig"); const Library = @import("Library.zig"); const Tag = @import("tag.zig").Tag; diff --git a/pkg/freetype/main.zig b/pkg/freetype/main.zig index bfa5e6bc1..b39650423 100644 --- a/pkg/freetype/main.zig +++ b/pkg/freetype/main.zig @@ -1,10 +1,16 @@ -pub const c = @import("c.zig"); +const computations = @import("computations.zig"); +const errors = @import("errors.zig"); +const face = @import("face.zig"); +const tag = @import("tag.zig"); + +pub const c = @import("c.zig").c; pub const testing = @import("test.zig"); pub const Library = @import("Library.zig"); -pub usingnamespace @import("computations.zig"); -pub usingnamespace @import("errors.zig"); -pub usingnamespace @import("face.zig"); -pub usingnamespace @import("tag.zig"); + +pub const Error = errors.Error; +pub const Face = face.Face; +pub const Tag = tag.Tag; +pub const mulFix = computations.mulFix; test { @import("std").testing.refAllDecls(@This());