diff options
| author | Michael Biebl <biebl@debian.org> | 2017-02-16 00:00:34 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2017-02-16 00:00:34 +0100 |
| commit | a222e56e103f949b148a6942e385ccca2c26d9f3 (patch) | |
| tree | 7978165f4d291224c854adb4c96c863a924b4882 /shared | |
| parent | 7f4dff3943c64e1d0e5d13b2ac915088dde165e6 (diff) | |
New upstream version 1.6.2 upstream/1.6.2
Diffstat (limited to 'shared')
| -rw-r--r-- | shared/nm-utils/nm-glib.h | 19 | ||||
| -rw-r--r-- | shared/nm-version-macros.h | 8 | ||||
| -rw-r--r-- | shared/nm-version-macros.h.in | 6 |
3 files changed, 20 insertions, 13 deletions
diff --git a/shared/nm-utils/nm-glib.h b/shared/nm-utils/nm-glib.h index 824a08ca..03251ca0 100644 --- a/shared/nm-utils/nm-glib.h +++ b/shared/nm-utils/nm-glib.h @@ -134,14 +134,17 @@ __g_type_ensure (GType type) /* Rumtime check for glib version. First do a compile time check which * (if satisfied) shortcuts the runtime check. */ -#define nm_glib_check_version(major, minor, micro) \ - ( GLIB_CHECK_VERSION ((major), (minor), (micro)) \ - || ( ( glib_major_version > (major)) \ - || ( glib_major_version == (major) \ - && glib_minor_version > (minor)) \ - || ( glib_major_version == (major) \ - && glib_minor_version == (minor) \ - && glib_micro_version >= (micro)))) +inline static gboolean +nm_glib_check_version (guint major, guint minor, guint micro) +{ + return GLIB_CHECK_VERSION (major, minor, micro) + || ( ( glib_major_version > major) + || ( glib_major_version == major + && glib_minor_version > minor) + || ( glib_major_version == major + && glib_minor_version == minor + && glib_micro_version < micro)); +} /* g_test_skip() is only available since glib 2.38. Add a compatibility wrapper. */ inline static void diff --git a/shared/nm-version-macros.h b/shared/nm-version-macros.h index 9783bca3..5066d757 100644 --- a/shared/nm-version-macros.h +++ b/shared/nm-version-macros.h @@ -45,7 +45,7 @@ * Evaluates to the micro version number of NetworkManager which this source * compiled against. */ -#define NM_MICRO_VERSION (0) +#define NM_MICRO_VERSION (2) /** * NM_CHECK_VERSION: @@ -70,9 +70,11 @@ #define NM_VERSION_1_2 (NM_ENCODE_VERSION (1, 2, 0)) #define NM_VERSION_1_4 (NM_ENCODE_VERSION (1, 4, 0)) #define NM_VERSION_1_6 (NM_ENCODE_VERSION (1, 6, 0)) +#define NM_VERSION_1_6_2 (NM_ENCODE_VERSION (1, 6, 2)) +#define NM_VERSION_1_6_4 (NM_ENCODE_VERSION (1, 6, 4)) -#define NM_VERSION_CUR_STABLE NM_VERSION_1_4 -#define NM_VERSION_NEXT_STABLE NM_VERSION_1_6 +#define NM_VERSION_CUR_STABLE NM_VERSION_1_6_2 +#define NM_VERSION_NEXT_STABLE NM_VERSION_1_6_4 #define NM_VERSION NM_ENCODE_VERSION (NM_MAJOR_VERSION, NM_MINOR_VERSION, NM_MICRO_VERSION) diff --git a/shared/nm-version-macros.h.in b/shared/nm-version-macros.h.in index 169e4950..c85c7624 100644 --- a/shared/nm-version-macros.h.in +++ b/shared/nm-version-macros.h.in @@ -70,9 +70,11 @@ #define NM_VERSION_1_2 (NM_ENCODE_VERSION (1, 2, 0)) #define NM_VERSION_1_4 (NM_ENCODE_VERSION (1, 4, 0)) #define NM_VERSION_1_6 (NM_ENCODE_VERSION (1, 6, 0)) +#define NM_VERSION_1_6_2 (NM_ENCODE_VERSION (1, 6, 2)) +#define NM_VERSION_1_6_4 (NM_ENCODE_VERSION (1, 6, 4)) -#define NM_VERSION_CUR_STABLE NM_VERSION_1_4 -#define NM_VERSION_NEXT_STABLE NM_VERSION_1_6 +#define NM_VERSION_CUR_STABLE NM_VERSION_1_6_2 +#define NM_VERSION_NEXT_STABLE NM_VERSION_1_6_4 #define NM_VERSION NM_ENCODE_VERSION (NM_MAJOR_VERSION, NM_MINOR_VERSION, NM_MICRO_VERSION) |