hyprwm
/
xdg-desktop-portal-hyprland
mirror of https://github.com/hyprwm/xdg-desktop-portal-hyprland.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

globalshortcuts: fix -Wint-conversion as error with Clang 15 (#42) 

src/globalshortcuts/global_shortcuts.c:40:44: error: incompatible pointer to integer conversion initializing 'uint64_t' (aka 'unsigned long') with an expression of type 'void *' [-Wint-conversion]
    SD_BUS_SIGNAL("Activated", "osta{sv}", NULL),
                                           ^~~~
src/globalshortcuts/global_shortcuts.c:41:46: error: incompatible pointer to integer conversion initializing 'uint64_t' (aka 'unsigned long') with an expression of type 'void *' [-Wint-conversion]
    SD_BUS_SIGNAL("Deactivated", "osta{sv}", NULL),
                                             ^~~~
src/globalshortcuts/global_shortcuts.c:42:53: error: incompatible pointer to integer conversion initializing 'uint64_t' (aka 'unsigned long') with an expression of type 'void *' [-Wint-conversion]
    SD_BUS_SIGNAL("ShortcutsChanged", "oa(sa{sv})", NULL),
                                                    ^~~~
/usr/include/sys/_null.h:34:14: note: expanded from macro 'NULL'
 #define NULL    ((void *)0)
                 ^~~~~~~~~~~
/usr/include/basu/sd-bus-vtable.h:113:26: note: expanded from macro 'SD_BUS_SIGNAL'
                .flags = _flags,                                        \
                         ^~~~~~
This commit is contained in:
Jan Beich 2023-04-10 11:27:59 +00:00 committed by GitHub
parent 0527deefe8
commit e33206673d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/globalshortcuts/global_shortcuts.c
View File

@ -37,9 +37,9 @@ static const sd_bus_vtable gs_vtable[] = {
SD_BUS_METHOD("CreateSession", "oosa{sv}", "ua{sv}", method_gs_create_session, SD_BUS_VTABLE_UNPRIVILEGED),
SD_BUS_METHOD("BindShortcuts", "ooa(sa{sv})sa{sv}", "ua{sv}", method_gs_bind_shortcuts, SD_BUS_VTABLE_UNPRIVILEGED),
SD_BUS_METHOD("ListShortcuts", "oo", "ua{sv}", method_gs_list_shortcuts, SD_BUS_VTABLE_UNPRIVILEGED),
SD_BUS_SIGNAL("Activated", "osta{sv}", NULL),
SD_BUS_SIGNAL("Deactivated", "osta{sv}", NULL),
SD_BUS_SIGNAL("ShortcutsChanged", "oa(sa{sv})", NULL),
SD_BUS_SIGNAL("Activated", "osta{sv}", 0),
SD_BUS_SIGNAL("Deactivated", "osta{sv}", 0),
SD_BUS_SIGNAL("ShortcutsChanged", "oa(sa{sv})", 0),
SD_BUS_VTABLE_END};
static void handleActivated(void *data, struct hyprland_global_shortcut_v1 *hyprland_global_shortcut_v1, uint32_t tv_sec_hi, uint32_t tv_sec_lo,