Skip to content

Commit 30b29ee

Browse files
committed
Explicit callconv(.c)
See #19
1 parent 75ab44d commit 30b29ee

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

src/zglfw.zig

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -169,10 +169,10 @@ extern fn glfwSwapInterval(interval: c_int) void;
169169

170170
pub const GlProc = *const anyopaque;
171171

172-
pub fn getProcAddress(procname: [*:0]const u8) ?GlProc {
172+
pub fn getProcAddress(procname: [*:0]const u8) callconv(.c) ?GlProc {
173173
return glfwGetProcAddress(procname);
174174
}
175-
extern fn glfwGetProcAddress(procname: [*:0]const u8) ?GlProc;
175+
extern fn glfwGetProcAddress(procname: [*:0]const u8) callconv(.c) ?GlProc;
176176

177177
//--------------------------------------------------------------------------------------------------
178178
//
@@ -804,7 +804,7 @@ extern fn glfwSetWindowAttrib(window: *Window, attrib: Window.Attribute, value:
804804
pub fn getWindowUserPointer(window: *Window, comptime T: type) ?*T {
805805
return @ptrCast(@alignCast(glfwGetWindowUserPointer(window)));
806806
}
807-
extern fn glfwGetWindowUserPointer(window: *Window) ?*anyopaque;
807+
extern fn glfwGetWindowUserPointer(window: *Window) callconv(.c) ?*anyopaque;
808808

809809
pub fn setWindowUserPointer(window: *Window, pointer: ?*anyopaque) void {
810810
glfwSetWindowUserPointer(window, pointer);
@@ -1168,8 +1168,8 @@ fn _getX11Adapter(_: *Monitor) u32 {
11681168
}
11691169

11701170
pub const getX11Display = if (_isLinuxDesktopLike() and options.enable_x11) glfwGetX11Display else _getX11Display;
1171-
extern fn glfwGetX11Display() ?*anyopaque;
1172-
fn _getX11Display() ?*anyopaque {
1171+
extern fn glfwGetX11Display() callconv(.c) ?*anyopaque;
1172+
fn _getX11Display() callconv(.c) ?*anyopaque {
11731173
return null;
11741174
}
11751175

@@ -1180,20 +1180,20 @@ fn _getX11Window(_: *Window) u32 {
11801180
}
11811181

11821182
pub const getWaylandDisplay = if (_isLinuxDesktopLike() and options.enable_wayland) glfwGetWaylandDisplay else _getWaylandDisplay;
1183-
extern fn glfwGetWaylandDisplay() ?*anyopaque;
1184-
fn _getWaylandDisplay() ?*anyopaque {
1183+
extern fn glfwGetWaylandDisplay() callconv(.c) ?*anyopaque;
1184+
fn _getWaylandDisplay() callconv(.c) ?*anyopaque {
11851185
return null;
11861186
}
11871187

11881188
pub const getWaylandWindow = if (_isLinuxDesktopLike() and options.enable_wayland) glfwGetWaylandWindow else _getWaylandWindow;
1189-
extern fn glfwGetWaylandWindow(window: *Window) ?*anyopaque;
1190-
fn _getWaylandWindow(_: *Window) ?*anyopaque {
1189+
extern fn glfwGetWaylandWindow(window: *Window) callconv(.c) ?*anyopaque;
1190+
fn _getWaylandWindow(_: *Window) callconv(.c) ?*anyopaque {
11911191
return null;
11921192
}
11931193

11941194
pub const getCocoaWindow = if (builtin.target.os.tag == .macos) glfwGetCocoaWindow else _getCocoaWindow;
1195-
extern fn glfwGetCocoaWindow(window: *Window) ?*anyopaque;
1196-
fn _getCocoaWindow(_: *Window) ?*anyopaque {
1195+
extern fn glfwGetCocoaWindow(window: *Window) callconv(.c) ?*anyopaque;
1196+
fn _getCocoaWindow(_: *Window) callconv(.c) ?*anyopaque {
11971197
return null;
11981198
}
11991199

0 commit comments

Comments
 (0)