From f60117b41d5433be1b4a96d82cd11d0c3dce9b63 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 23 Apr 2018 18:00:21 +0200 Subject: New upstream version 1.11.3 --- shared/nm-version-macros.h.in | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) (limited to 'shared/nm-version-macros.h.in') diff --git a/shared/nm-version-macros.h.in b/shared/nm-version-macros.h.in index f92bed82..8d07fc82 100644 --- a/shared/nm-version-macros.h.in +++ b/shared/nm-version-macros.h.in @@ -72,12 +72,25 @@ #define NM_VERSION_1_6 (NM_ENCODE_VERSION (1, 6, 0)) #define NM_VERSION_1_8 (NM_ENCODE_VERSION (1, 8, 0)) #define NM_VERSION_1_10 (NM_ENCODE_VERSION (1, 10, 0)) -#define NM_VERSION_1_10_2 (NM_ENCODE_VERSION (1, 10, 2)) -#define NM_VERSION_1_10_4 (NM_ENCODE_VERSION (1, 10, 4)) -#define NM_VERSION_1_10_6 (NM_ENCODE_VERSION (1, 10, 6)) +#define NM_VERSION_1_12 (NM_ENCODE_VERSION (1, 12, 0)) -#define NM_VERSION_CUR_STABLE NM_VERSION_1_10_6 -#define NM_VERSION_NEXT_STABLE NM_VERSION_1_10_6 +/* For releases, NM_API_VERSION is equal to NM_VERSION. + * + * For development builds, NM_API_VERSION is the next + * stable API after NM_VERSION. When you run a development + * version, you are already using the future API, even if + * it is not yet release. Hence, the currently used API + * version is the future one. */ +#define NM_API_VERSION \ + (((NM_MINOR_VERSION % 2) == 1) \ + ? NM_ENCODE_VERSION (NM_MAJOR_VERSION, NM_MINOR_VERSION + 1, 0 ) \ + : NM_ENCODE_VERSION (NM_MAJOR_VERSION, NM_MINOR_VERSION , ((NM_MICRO_VERSION + 1) / 2) * 2)) + +/* deprecated. */ +#define NM_VERSION_CUR_STABLE NM_API_VERSION + +/* deprecated. */ +#define NM_VERSION_NEXT_STABLE NM_API_VERSION #define NM_VERSION NM_ENCODE_VERSION (NM_MAJOR_VERSION, NM_MINOR_VERSION, NM_MICRO_VERSION) -- cgit 1.3.0-6-gf8a5 From ee9c73a923909e23a649407be77e25235d769e25 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 11 May 2018 22:08:45 +0200 Subject: New upstream version 1.10.8 --- shared/nm-version-macros.h.in | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) (limited to 'shared/nm-version-macros.h.in') diff --git a/shared/nm-version-macros.h.in b/shared/nm-version-macros.h.in index 8d07fc82..cb1d545a 100644 --- a/shared/nm-version-macros.h.in +++ b/shared/nm-version-macros.h.in @@ -72,25 +72,13 @@ #define NM_VERSION_1_6 (NM_ENCODE_VERSION (1, 6, 0)) #define NM_VERSION_1_8 (NM_ENCODE_VERSION (1, 8, 0)) #define NM_VERSION_1_10 (NM_ENCODE_VERSION (1, 10, 0)) -#define NM_VERSION_1_12 (NM_ENCODE_VERSION (1, 12, 0)) +#define NM_VERSION_1_10_2 (NM_ENCODE_VERSION (1, 10, 2)) +#define NM_VERSION_1_10_4 (NM_ENCODE_VERSION (1, 10, 4)) +#define NM_VERSION_1_10_6 (NM_ENCODE_VERSION (1, 10, 6)) +#define NM_VERSION_1_10_8 (NM_ENCODE_VERSION (1, 10, 8)) -/* For releases, NM_API_VERSION is equal to NM_VERSION. - * - * For development builds, NM_API_VERSION is the next - * stable API after NM_VERSION. When you run a development - * version, you are already using the future API, even if - * it is not yet release. Hence, the currently used API - * version is the future one. */ -#define NM_API_VERSION \ - (((NM_MINOR_VERSION % 2) == 1) \ - ? NM_ENCODE_VERSION (NM_MAJOR_VERSION, NM_MINOR_VERSION + 1, 0 ) \ - : NM_ENCODE_VERSION (NM_MAJOR_VERSION, NM_MINOR_VERSION , ((NM_MICRO_VERSION + 1) / 2) * 2)) - -/* deprecated. */ -#define NM_VERSION_CUR_STABLE NM_API_VERSION - -/* deprecated. */ -#define NM_VERSION_NEXT_STABLE NM_API_VERSION +#define NM_VERSION_CUR_STABLE NM_VERSION_1_10_8 +#define NM_VERSION_NEXT_STABLE NM_VERSION_1_10_8 #define NM_VERSION NM_ENCODE_VERSION (NM_MAJOR_VERSION, NM_MINOR_VERSION, NM_MICRO_VERSION) -- cgit 1.3.0-6-gf8a5