zig

commit 4440391d81cfbc3d5231495fde2416a71f644da4 (tree)
parent 11dce78944ecfab1838cd678f75c354aa376a8bf
Author: r00ster91 <r00ster91@proton.me>
Date:   Sun, 18 Sep 2022 20:21:59 +0200

fix: wrap function pointers in std.meta.FnPtr

Diffstat:
M
lib/std/os/uefi/protocols/simple_text_input_ex_protocol.zig
 | 
4
++--
M
lib/std/os/uefi/tables/boot_services.zig
 | 
2
+-

2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/lib/std/os/uefi/protocols/simple_text_input_ex_protocol.zig b/lib/std/os/uefi/protocols/simple_text_input_ex_protocol.zig
@@ -10,7 +10,7 @@ pub const SimpleTextInputExProtocol = extern struct {
     _read_key_stroke_ex: std.meta.FnPtr(fn (*const SimpleTextInputExProtocol, *KeyData) callconv(.C) Status),
     wait_for_key_ex: Event,
     _set_state: std.meta.FnPtr(fn (*const SimpleTextInputExProtocol, *const u8) callconv(.C) Status),
-    _register_key_notify: std.meta.FnPtr(fn (*const SimpleTextInputExProtocol, *const KeyData, fn (*const KeyData) callconv(.C) usize, **anyopaque) callconv(.C) Status),
+    _register_key_notify: std.meta.FnPtr(fn (*const SimpleTextInputExProtocol, *const KeyData, std.meta.FnPtr(fn (*const KeyData) callconv(.C) usize), **anyopaque) callconv(.C) Status),
     _unregister_key_notify: std.meta.FnPtr(fn (*const SimpleTextInputExProtocol, *const anyopaque) callconv(.C) Status),
 
     /// Resets the input device hardware.
@@ -29,7 +29,7 @@ pub const SimpleTextInputExProtocol = extern struct {
     }
 
     /// Register a notification function for a particular keystroke for the input device.
-    pub fn registerKeyNotify(self: *const SimpleTextInputExProtocol, key_data: *const KeyData, notify: fn (*const KeyData) callconv(.C) usize, handle: **anyopaque) Status {
+    pub fn registerKeyNotify(self: *const SimpleTextInputExProtocol, key_data: *const KeyData, notify: std.meta.FnPtr(fn (*const KeyData) callconv(.C) usize), handle: **anyopaque) Status {
         return self._register_key_notify(self, key_data, notify, handle);
     }
 
diff --git a/lib/std/os/uefi/tables/boot_services.zig b/lib/std/os/uefi/tables/boot_services.zig
@@ -191,7 +191,7 @@ pub const BootServices = extern struct {
     pub const tpl_high_level: usize = 31;
 };
 
-pub const EfiEventNotify = fn (event: Event, ctx: *anyopaque) callconv(.C) void;
+pub const EfiEventNotify = std.meta.FnPtr(fn (event: Event, ctx: *anyopaque) callconv(.C) void);
 
 pub const TimerDelay = enum(u32) {
     TimerCancel,