From e33206673d95aead7c58d1413516d1eec49de238 Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Mon, 10 Apr 2023 11:27:59 +0000 Subject: [PATCH] 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, \ ^~~~~~ --- src/globalshortcuts/global_shortcuts.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/globalshortcuts/global_shortcuts.c b/src/globalshortcuts/global_shortcuts.c index ceed39c..7a55f68 100644 --- a/src/globalshortcuts/global_shortcuts.c +++ b/src/globalshortcuts/global_shortcuts.c @@ -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,