diff options
| author | Michael Biebl <biebl@debian.org> | 2015-07-14 19:39:12 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2015-07-14 19:39:12 +0200 |
| commit | 34b1c46437df982495d08a8bbb8bd0b262d8af48 (patch) | |
| tree | 1db29ec39d9f733922b3a33cabcc8e6486fa06aa /libnm-core/nm-version.h | |
| parent | 50fc50153b0036516b853aa576dc435bd53ce736 (diff) | |
| parent | 50a58f0fabd8a34c1b6108a107e08abe3c1ccd24 (diff) | |
Merge tag 'upstream/1.0.4'
Upstream version 1.0.4
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 46103544..e36d921e 100644 --- a/libnm-core/nm-version.h +++ b/libnm-core/nm-version.h @@ -43,7 +43,7 @@ * Evaluates to the micro version number of NetworkManager which this source * compiled against. */ -#define NM_MICRO_VERSION (2) +#define NM_MICRO_VERSION (4) /** * NM_CHECK_VERSION: @@ -67,9 +67,11 @@ #define NM_VERSION_0_9_8 (NM_ENCODE_VERSION (0, 9, 8)) #define NM_VERSION_0_9_10 (NM_ENCODE_VERSION (0, 9, 10)) #define NM_VERSION_1_0 (NM_ENCODE_VERSION (1, 0, 0)) +#define NM_VERSION_1_0_2 (NM_ENCODE_VERSION (1, 0, 2)) +#define NM_VERSION_1_0_4 (NM_ENCODE_VERSION (1, 0, 4)) -#define NM_VERSION_CUR_STABLE NM_VERSION_1_0 -#define NM_VERSION_NEXT_STABLE NM_VERSION_1_0 +#define NM_VERSION_CUR_STABLE NM_VERSION_1_0_2 +#define NM_VERSION_NEXT_STABLE NM_VERSION_1_0_4 #if !defined (NM_VERSION_MIN_REQUIRED) || (NM_VERSION_MIN_REQUIRED == 0) # undef NM_VERSION_MIN_REQUIRED @@ -120,4 +122,10 @@ # define NM_AVAILABLE_IN_1_0 #endif +#if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_0_4 +# define NM_AVAILABLE_IN_1_0_4 G_UNAVAILABLE(1,0.4) +#else +# define NM_AVAILABLE_IN_1_0_4 +#endif + #endif /* NM_VERSION_H */ |