New upstream version 1.34.0 upstream/1.34.0

1 files changed, 5 insertions, 2 deletions

diff --git a/src/core/nm-dispatcher.h b/src/core/nm-dispatcher.h
index d588de4e..8e4f01cb 100644
--- a/src/core/nm-dispatcher.h
+++ b/src/core/nm-dispatcher.h
@@ -19,11 +19,14 @@ typedef enum {
     NM_DISPATCHER_ACTION_VPN_UP,
     NM_DISPATCHER_ACTION_VPN_PRE_DOWN,
     NM_DISPATCHER_ACTION_VPN_DOWN,
-    NM_DISPATCHER_ACTION_DHCP4_CHANGE,
-    NM_DISPATCHER_ACTION_DHCP6_CHANGE,
+    NM_DISPATCHER_ACTION_DHCP_CHANGE_4,
+    NM_DISPATCHER_ACTION_DHCP_CHANGE_6,
     NM_DISPATCHER_ACTION_CONNECTIVITY_CHANGE
 } NMDispatcherAction;
 
+#define NM_DISPATCHER_ACTION_DHCP_CHANGE_X(IS_IPv4) \
+    ((IS_IPv4) ? NM_DISPATCHER_ACTION_DHCP_CHANGE_4 : NM_DISPATCHER_ACTION_DHCP_CHANGE_6)
+
 typedef struct NMDispatcherCallId NMDispatcherCallId;
 
 typedef void (*NMDispatcherFunc)(NMDispatcherCallId *call_id, gpointer user_data);