diff options
Diffstat (limited to 'src/libnm-core-public/nm-version-macros.h')
| -rw-r--r-- | src/libnm-core-public/nm-version-macros.h | 73 |
1 files changed, 36 insertions, 37 deletions
diff --git a/src/libnm-core-public/nm-version-macros.h b/src/libnm-core-public/nm-version-macros.h index f3d50252..bbdeb2f3 100644 --- a/src/libnm-core-public/nm-version-macros.h +++ b/src/libnm-core-public/nm-version-macros.h @@ -22,7 +22,7 @@ * Evaluates to the minor version number of NetworkManager which this source * is compiled against. */ -#define NM_MINOR_VERSION (40) +#define NM_MINOR_VERSION (42) /** * NM_MICRO_VERSION: @@ -30,7 +30,7 @@ * Evaluates to the micro version number of NetworkManager which this source * compiled against. */ -#define NM_MICRO_VERSION (12) +#define NM_MICRO_VERSION (0) /** * NM_CHECK_VERSION: @@ -41,38 +41,37 @@ * Returns: %TRUE if the version of the NetworkManager header files * is the same as or newer than the passed-in version. */ -#define NM_CHECK_VERSION(major,minor,micro) \ - (NM_MAJOR_VERSION > (major) || \ - (NM_MAJOR_VERSION == (major) && NM_MINOR_VERSION > (minor)) || \ +#define NM_CHECK_VERSION(major, minor, micro) \ + (NM_MAJOR_VERSION > (major) || \ + (NM_MAJOR_VERSION == (major) && NM_MINOR_VERSION > (minor)) || \ (NM_MAJOR_VERSION == (major) && NM_MINOR_VERSION == (minor) && NM_MICRO_VERSION >= (micro))) +#define NM_ENCODE_VERSION(major, minor, micro) ((major) << 16 | (minor) << 8 | (micro)) -#define NM_ENCODE_VERSION(major,minor,micro) ((major) << 16 | (minor) << 8 | (micro)) - -#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_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_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_14 (NM_ENCODE_VERSION (1, 14, 0)) -#define NM_VERSION_1_16 (NM_ENCODE_VERSION (1, 16, 0)) -#define NM_VERSION_1_18 (NM_ENCODE_VERSION (1, 18, 0)) -#define NM_VERSION_1_20 (NM_ENCODE_VERSION (1, 20, 0)) -#define NM_VERSION_1_22 (NM_ENCODE_VERSION (1, 22, 0)) -#define NM_VERSION_1_24 (NM_ENCODE_VERSION (1, 24, 0)) -#define NM_VERSION_1_26 (NM_ENCODE_VERSION (1, 26, 0)) -#define NM_VERSION_1_28 (NM_ENCODE_VERSION (1, 28, 0)) -#define NM_VERSION_1_30 (NM_ENCODE_VERSION (1, 30, 0)) -#define NM_VERSION_1_32 (NM_ENCODE_VERSION (1, 32, 0)) -#define NM_VERSION_1_34 (NM_ENCODE_VERSION (1, 34, 0)) -#define NM_VERSION_1_36 (NM_ENCODE_VERSION (1, 36, 0)) -#define NM_VERSION_1_38 (NM_ENCODE_VERSION (1, 38, 0)) -#define NM_VERSION_1_40 (NM_ENCODE_VERSION (1, 40, 0)) -#define NM_VERSION_1_40_4 (NM_ENCODE_VERSION (1, 40, 4)) +#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_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_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_14 (NM_ENCODE_VERSION(1, 14, 0)) +#define NM_VERSION_1_16 (NM_ENCODE_VERSION(1, 16, 0)) +#define NM_VERSION_1_18 (NM_ENCODE_VERSION(1, 18, 0)) +#define NM_VERSION_1_20 (NM_ENCODE_VERSION(1, 20, 0)) +#define NM_VERSION_1_22 (NM_ENCODE_VERSION(1, 22, 0)) +#define NM_VERSION_1_24 (NM_ENCODE_VERSION(1, 24, 0)) +#define NM_VERSION_1_26 (NM_ENCODE_VERSION(1, 26, 0)) +#define NM_VERSION_1_28 (NM_ENCODE_VERSION(1, 28, 0)) +#define NM_VERSION_1_30 (NM_ENCODE_VERSION(1, 30, 0)) +#define NM_VERSION_1_32 (NM_ENCODE_VERSION(1, 32, 0)) +#define NM_VERSION_1_34 (NM_ENCODE_VERSION(1, 34, 0)) +#define NM_VERSION_1_36 (NM_ENCODE_VERSION(1, 36, 0)) +#define NM_VERSION_1_38 (NM_ENCODE_VERSION(1, 38, 0)) +#define NM_VERSION_1_40 (NM_ENCODE_VERSION(1, 40, 0)) +#define NM_VERSION_1_42 (NM_ENCODE_VERSION(1, 42, 0)) /* For releases, NM_API_VERSION is equal to NM_VERSION. * @@ -81,17 +80,17 @@ * version, you are already using the future API, even if * it is not yet released. 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 ) \ +#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 +#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) +#define NM_VERSION NM_ENCODE_VERSION(NM_MAJOR_VERSION, NM_MINOR_VERSION, NM_MICRO_VERSION) -#endif /* __NM_VERSION_MACROS_H__ */ +#endif /* __NM_VERSION_MACROS_H__ */ |