From e002b6a4fecf3524c8abeaf7a08aa149e84160a8 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 25 Sep 2015 16:18:00 +0200 Subject: [PATCH] libnm: add NM_AVAILABLE_IN_1_0_6 to "nm-dbus-interface.h" "nm-dbus-interface.h" can be used without glib/libnm, hence we must workaround a missing NM_AVAILABLE_IN_1_0_6 macro. (cherry picked from commit c60ff9e7e0a690657c8e2117bdc29fd078ed5ea5) --- libnm-core/nm-dbus-interface.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/libnm-core/nm-dbus-interface.h b/libnm-core/nm-dbus-interface.h index 10d384ab1c..ba3ec21860 100644 --- a/libnm-core/nm-dbus-interface.h +++ b/libnm-core/nm-dbus-interface.h @@ -26,6 +26,10 @@ #ifndef __NM_DBUS_INTERFACE_H__ #define __NM_DBUS_INTERFACE_H__ +#ifndef NM_VERSION_H +#define NM_AVAILABLE_IN_1_0_6 +#endif + /* * dbus services details */ @@ -549,6 +553,7 @@ typedef enum { * * Since: 1.0.6 **/ +NM_AVAILABLE_IN_1_0_6 typedef enum { NM_METERED_UNKNOWN = 0, NM_METERED_YES = 1, @@ -636,4 +641,8 @@ typedef enum /*< flags >*/ { NM_SECRET_AGENT_CAPABILITY_LAST = NM_SECRET_AGENT_CAPABILITY_VPN_HINTS } NMSecretAgentCapabilities; +#ifndef NM_VERSION_H +#undef NM_AVAILABLE_IN_1_0_6 +#endif + #endif /* __NM_DBUS_INTERFACE_H__ */