diff options
| author | Michael Biebl <biebl@debian.org> | 2017-01-17 20:25:47 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2017-01-17 20:25:47 +0100 |
| commit | bed53db3e064450b56e23ec654f40a3bafe58815 (patch) | |
| tree | 314508d6c904b1224dab2070e0cfdd5a02d7dd89 /libnm-core/nm-version.h | |
| parent | 7135a6e87c938139e3a5db121d62dcaa783345d1 (diff) | |
| parent | 58f8be580039b0575b197b9573a1c92745d96d30 (diff) | |
Merge tag 'upstream/1.5.90' into experimental
Upstream version 1.5.90
Diffstat (limited to 'libnm-core/nm-version.h')
| -rw-r--r-- | libnm-core/nm-version.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/libnm-core/nm-version.h b/libnm-core/nm-version.h index d7f112bf..aa92c3f8 100644 --- a/libnm-core/nm-version.h +++ b/libnm-core/nm-version.h @@ -104,4 +104,18 @@ # define NM_AVAILABLE_IN_1_4 #endif +#if NM_VERSION_MIN_REQUIRED >= NM_VERSION_1_6 +# define NM_DEPRECATED_IN_1_6 G_DEPRECATED +# define NM_DEPRECATED_IN_1_6_FOR(f) G_DEPRECATED_FOR(f) +#else +# define NM_DEPRECATED_IN_1_6 +# define NM_DEPRECATED_IN_1_6_FOR(f) +#endif + +#if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_6 +# define NM_AVAILABLE_IN_1_6 G_UNAVAILABLE(1,6) +#else +# define NM_AVAILABLE_IN_1_6 +#endif + #endif /* NM_VERSION_H */ |