diff options
| author | Michael Biebl <biebl@debian.org> | 2018-05-11 22:08:45 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2018-05-11 22:08:45 +0200 |
| commit | ee9c73a923909e23a649407be77e25235d769e25 (patch) | |
| tree | e21c923621fa278e737da693df9eb60ea31a6067 /libnm-core/nm-version.h | |
| parent | f60117b41d5433be1b4a96d82cd11d0c3dce9b63 (diff) | |
New upstream version 1.10.8 upstream/1.10.8
Diffstat (limited to 'libnm-core/nm-version.h')
| -rw-r--r-- | libnm-core/nm-version.h | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/libnm-core/nm-version.h b/libnm-core/nm-version.h index 0412bc8e..61bfa5b1 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_API_VERSION) +# define NM_VERSION_MIN_REQUIRED (NM_VERSION_CUR_STABLE) #endif #if !defined (NM_VERSION_MAX_ALLOWED) || (NM_VERSION_MAX_ALLOWED == 0) # undef NM_VERSION_MAX_ALLOWED -# define NM_VERSION_MAX_ALLOWED (NM_API_VERSION) +# define NM_VERSION_MAX_ALLOWED (NM_VERSION_CUR_STABLE) #endif /* sanity checks */ -#if NM_VERSION_MIN_REQUIRED > NM_API_VERSION -#error "NM_VERSION_MIN_REQUIRED must be <= NM_API_VERSION" +#if NM_VERSION_MIN_REQUIRED > NM_VERSION_NEXT_STABLE +#error "NM_VERSION_MIN_REQUIRED must be <= NM_VERSION_NEXT_STABLE" #endif #if NM_VERSION_MAX_ALLOWED < NM_VERSION_MIN_REQUIRED #error "NM_VERSION_MAX_ALLOWED must be >= NM_VERSION_MIN_REQUIRED" @@ -146,18 +146,10 @@ # define NM_AVAILABLE_IN_1_10 #endif -#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) +#if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_10_2 +# define NM_AVAILABLE_IN_1_10_2 G_UNAVAILABLE(1,10.2) #else -# 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 +# define NM_AVAILABLE_IN_1_10_2 #endif #endif /* NM_VERSION_H */ |