diff options
Diffstat (limited to 'libnm-core/nm-version.h')
| -rw-r--r-- | libnm-core/nm-version.h | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/libnm-core/nm-version.h b/libnm-core/nm-version.h index 61bfa5b1..0412bc8e 100644 --- a/libnm-core/nm-version.h +++ b/libnm-core/nm-version.h @@ -29,17 +29,17 @@ #if !defined (NM_VERSION_MIN_REQUIRED) || (NM_VERSION_MIN_REQUIRED == 0) # undef NM_VERSION_MIN_REQUIRED -# define NM_VERSION_MIN_REQUIRED (NM_VERSION_CUR_STABLE) +# define NM_VERSION_MIN_REQUIRED (NM_API_VERSION) #endif #if !defined (NM_VERSION_MAX_ALLOWED) || (NM_VERSION_MAX_ALLOWED == 0) # undef NM_VERSION_MAX_ALLOWED -# define NM_VERSION_MAX_ALLOWED (NM_VERSION_CUR_STABLE) +# define NM_VERSION_MAX_ALLOWED (NM_API_VERSION) #endif /* sanity checks */ -#if NM_VERSION_MIN_REQUIRED > NM_VERSION_NEXT_STABLE -#error "NM_VERSION_MIN_REQUIRED must be <= NM_VERSION_NEXT_STABLE" +#if NM_VERSION_MIN_REQUIRED > NM_API_VERSION +#error "NM_VERSION_MIN_REQUIRED must be <= NM_API_VERSION" #endif #if NM_VERSION_MAX_ALLOWED < NM_VERSION_MIN_REQUIRED #error "NM_VERSION_MAX_ALLOWED must be >= NM_VERSION_MIN_REQUIRED" @@ -146,10 +146,18 @@ # define NM_AVAILABLE_IN_1_10 #endif -#if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_10_2 -# define NM_AVAILABLE_IN_1_10_2 G_UNAVAILABLE(1,10.2) +#if NM_VERSION_MIN_REQUIRED >= NM_VERSION_1_12 +# define NM_DEPRECATED_IN_1_12 G_DEPRECATED +# define NM_DEPRECATED_IN_1_12_FOR(f) G_DEPRECATED_FOR(f) #else -# define NM_AVAILABLE_IN_1_10_2 +# define NM_DEPRECATED_IN_1_12 +# define NM_DEPRECATED_IN_1_12_FOR(f) +#endif + +#if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_12 +# define NM_AVAILABLE_IN_1_12 G_UNAVAILABLE(1,12) +#else +# define NM_AVAILABLE_IN_1_12 #endif #endif /* NM_VERSION_H */ |