diff options
| author | Thomas Haller <thaller@redhat.com> | 2015-09-25 16:18:00 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2015-09-25 16:22:47 +0200 |
| commit | c60ff9e7e0a690657c8e2117bdc29fd078ed5ea5 (patch) | |
| tree | f8bce22173be10157611a29b781e93f4a2033ccf | |
| parent | 12e6cf1f2053f92dee227fc2ce9ea625fed9917e (diff) | |
| download | NetworkManager-c60ff9e7e0a690657c8e2117bdc29fd078ed5ea5.tar.gz | |
libnm: add NM_AVAILABLE_IN_1_2 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_2 macro.
| -rw-r--r-- | libnm-core/nm-dbus-interface.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/libnm-core/nm-dbus-interface.h b/libnm-core/nm-dbus-interface.h index 34dbe6335f..511cbeb00a 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_2 +#endif + /* * dbus services details */ @@ -549,6 +553,7 @@ typedef enum { * * Since: 1.2 **/ +NM_AVAILABLE_IN_1_2 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_2 +#endif + #endif /* __NM_DBUS_INTERFACE_H__ */ |