diff options
| author | Michael Biebl <biebl@debian.org> | 2015-11-24 00:06:46 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2015-11-24 00:06:46 +0100 |
| commit | 5916ab88146d04273e6a1895ba3eed7322f2625f (patch) | |
| tree | 54479065ceda124ef5ff84890de64c52717a5645 /libnm-core/nm-dbus-interface.h | |
| parent | 3f830f75cf071873c36e1365f80c31e2422e1f7c (diff) | |
| parent | a6ece1a2aa19a6268335c87d4fdef20123dd04a5 (diff) | |
Merge tag 'upstream/1.0.8'
Upstream version 1.0.8
Diffstat (limited to 'libnm-core/nm-dbus-interface.h')
| -rw-r--r-- | libnm-core/nm-dbus-interface.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/libnm-core/nm-dbus-interface.h b/libnm-core/nm-dbus-interface.h index 8c5cd3c4..ac20fa2e 100644 --- a/libnm-core/nm-dbus-interface.h +++ b/libnm-core/nm-dbus-interface.h @@ -26,7 +26,11 @@ #ifndef __NM_DBUS_INTERFACE_H__ #define __NM_DBUS_INTERFACE_H__ -#include "nm-version.h" +/* This header must not include glib or libnm. */ + +#ifndef NM_VERSION_H +#define NM_AVAILABLE_IN_1_0_6 +#endif /* * dbus services details @@ -639,4 +643,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__ */ |