authorgravatar for r00ster91@proton.meWooster <r00ster91@proton.me> 2022-09-18 20:21:59+02:00
committergravatar for r00ster91@proton.meWooster <r00ster91@proton.me> 2022-10-07 19:33:29+02:00
log4440391d81cfbc3d5231495fde2416a71f644da4
treeb325e90220d4f17c01dbf0e97f634042bb7d77fe
parent11dce78944ecfab1838cd678f75c354aa376a8bf

fix: wrap function pointers in std.meta.FnPtr

2 files changed, 3 insertions(+), 3 deletions(-)

lib/std/os/uefi/protocols/simple_text_input_ex_protocol.zig+2-2
...@@ -10,7 +10,7 @@ pub const SimpleTextInputExProtocol = extern struct {...@@ -10,7 +10,7 @@ pub const SimpleTextInputExProtocol = extern struct {
10 _read_key_stroke_ex: std.meta.FnPtr(fn (*const SimpleTextInputExProtocol, *KeyData) callconv(.C) Status),10 _read_key_stroke_ex: std.meta.FnPtr(fn (*const SimpleTextInputExProtocol, *KeyData) callconv(.C) Status),
11 wait_for_key_ex: Event,11 wait_for_key_ex: Event,
12 _set_state: std.meta.FnPtr(fn (*const SimpleTextInputExProtocol, *const u8) callconv(.C) Status),12 _set_state: std.meta.FnPtr(fn (*const SimpleTextInputExProtocol, *const u8) callconv(.C) Status),
13 _register_key_notify: std.meta.FnPtr(fn (*const SimpleTextInputExProtocol, *const KeyData, fn (*const KeyData) callconv(.C) usize, **anyopaque) callconv(.C) Status),13 _register_key_notify: std.meta.FnPtr(fn (*const SimpleTextInputExProtocol, *const KeyData, std.meta.FnPtr(fn (*const KeyData) callconv(.C) usize), **anyopaque) callconv(.C) Status),
14 _unregister_key_notify: std.meta.FnPtr(fn (*const SimpleTextInputExProtocol, *const anyopaque) callconv(.C) Status),14 _unregister_key_notify: std.meta.FnPtr(fn (*const SimpleTextInputExProtocol, *const anyopaque) callconv(.C) Status),
1515
16 /// Resets the input device hardware.16 /// Resets the input device hardware.
...@@ -29,7 +29,7 @@ pub const SimpleTextInputExProtocol = extern struct {...@@ -29,7 +29,7 @@ pub const SimpleTextInputExProtocol = extern struct {
29 }29 }
3030
31 /// Register a notification function for a particular keystroke for the input device.31 /// Register a notification function for a particular keystroke for the input device.
32 pub fn registerKeyNotify(self: *const SimpleTextInputExProtocol, key_data: *const KeyData, notify: fn (*const KeyData) callconv(.C) usize, handle: **anyopaque) Status {32 pub fn registerKeyNotify(self: *const SimpleTextInputExProtocol, key_data: *const KeyData, notify: std.meta.FnPtr(fn (*const KeyData) callconv(.C) usize), handle: **anyopaque) Status {
33 return self._register_key_notify(self, key_data, notify, handle);33 return self._register_key_notify(self, key_data, notify, handle);
34 }34 }
3535
lib/std/os/uefi/tables/boot_services.zig+1-1
...@@ -191,7 +191,7 @@ pub const BootServices = extern struct {...@@ -191,7 +191,7 @@ pub const BootServices = extern struct {
191 pub const tpl_high_level: usize = 31;191 pub const tpl_high_level: usize = 31;
192};192};
193193
194pub const EfiEventNotify = fn (event: Event, ctx: *anyopaque) callconv(.C) void;194pub const EfiEventNotify = std.meta.FnPtr(fn (event: Event, ctx: *anyopaque) callconv(.C) void);
195195
196pub const TimerDelay = enum(u32) {196pub const TimerDelay = enum(u32) {
197 TimerCancel,197 TimerCancel,