From 2bfb3eb7d0323e69affca154395f51d8b577414d Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 6 Apr 2016 00:46:19 +0200 Subject: Imported Upstream version 1.1.93 --- shared/nm-default.h | 6 ++++++ shared/nm-version-macros.h | 3 ++- shared/nm-version-macros.h.in | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) (limited to 'shared') diff --git a/shared/nm-default.h b/shared/nm-default.h index aae4777a..aeb977a9 100644 --- a/shared/nm-default.h +++ b/shared/nm-default.h @@ -46,6 +46,12 @@ #include #endif +/* for internal compilation we don't want the deprecation macros + * to be in effect. Define the widest range of versions to effectively + * disable deprecation checks */ +#define NM_VERSION_MAX_ALLOWED NM_VERSION_NEXT_STABLE +#define NM_VERSION_MIN_REQUIRED NM_VERSION_0_9_8 + #include #include "nm-glib.h" diff --git a/shared/nm-version-macros.h b/shared/nm-version-macros.h index fa27b4c2..8ac9b12a 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 (92) +#define NM_MICRO_VERSION (93) /** * NM_CHECK_VERSION: @@ -68,6 +68,7 @@ #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_CUR_STABLE NM_VERSION_1_0 #define NM_VERSION_NEXT_STABLE NM_VERSION_1_2 diff --git a/shared/nm-version-macros.h.in b/shared/nm-version-macros.h.in index a8ad5c8d..92bc65bc 100644 --- a/shared/nm-version-macros.h.in +++ b/shared/nm-version-macros.h.in @@ -68,6 +68,7 @@ #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_CUR_STABLE NM_VERSION_1_0 #define NM_VERSION_NEXT_STABLE NM_VERSION_1_2 -- cgit 1.3.0-6-gf8a5