diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2019-01-25 10:52:15 +0100 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2019-01-25 11:24:27 +0100 |
| commit | e8ac7dacdcf4b38addef4f8ac6ab038f9d29582c (patch) | |
| tree | 017883e210043859ee695250f6285380b795f8e4 /libnm-core/nm-version.h | |
| parent | b05c072fe2594e0369cbfb00a3fba176d2d309dc (diff) | |
| parent | 1b878e595ff7be634a4800ca6cc506046e49548e (diff) | |
Merge remote-tracking branch 'salsa/master' into disco
Diffstat (limited to 'libnm-core/nm-version.h')
| -rw-r--r-- | libnm-core/nm-version.h | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/libnm-core/nm-version.h b/libnm-core/nm-version.h index c2404895..59482d4e 100644 --- a/libnm-core/nm-version.h +++ b/libnm-core/nm-version.h @@ -160,10 +160,18 @@ # define NM_AVAILABLE_IN_1_12 #endif -#if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_12_2 -# define NM_AVAILABLE_IN_1_12_2 G_UNAVAILABLE(1,12.2) +#if NM_VERSION_MIN_REQUIRED >= NM_VERSION_1_14 +# define NM_DEPRECATED_IN_1_14 G_DEPRECATED +# define NM_DEPRECATED_IN_1_14_FOR(f) G_DEPRECATED_FOR(f) #else -# define NM_AVAILABLE_IN_1_12_2 +# define NM_DEPRECATED_IN_1_14 +# define NM_DEPRECATED_IN_1_14_FOR(f) +#endif + +#if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_14 +# define NM_AVAILABLE_IN_1_14 G_UNAVAILABLE(1,14) +#else +# define NM_AVAILABLE_IN_1_14 #endif #endif /* NM_VERSION_H */ |