From 38ef9ea0c48f984d9ecdd322804dda7f20185c57 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Sat, 8 Aug 2015 21:09:36 +0200 Subject: [PATCH] libnm-util: update NM_VERSION macros With this, "nm-version.h.in" is identical for "libnm-core/" and "libnm-util/". --- libnm-util/nm-version.h.in | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/libnm-util/nm-version.h.in b/libnm-util/nm-version.h.in index d0911b18bd..79bd959c8c 100644 --- a/libnm-util/nm-version.h.in +++ b/libnm-util/nm-version.h.in @@ -69,9 +69,12 @@ #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_1_0_6 (NM_ENCODE_VERSION (1, 0, 6)) -#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_4 +#define NM_VERSION_NEXT_STABLE NM_VERSION_1_0_6 #if !defined (NM_VERSION_MIN_REQUIRED) || (NM_VERSION_MIN_REQUIRED == 0) # undef NM_VERSION_MIN_REQUIRED @@ -102,6 +105,12 @@ # define NM_DEPRECATED_IN_0_9_10_FOR(f) #endif +#if NM_VERSION_MAX_ALLOWED < NM_VERSION_0_9_10 +# define NM_AVAILABLE_IN_0_9_10 G_UNAVAILABLE(0.9,10) +#else +# define NM_AVAILABLE_IN_0_9_10 +#endif + #if NM_VERSION_MIN_REQUIRED >= NM_VERSION_1_0 # define NM_DEPRECATED_IN_1_0 G_DEPRECATED # define NM_DEPRECATED_IN_1_0_FOR(f) G_DEPRECATED_FOR(f) @@ -110,16 +119,22 @@ # define NM_DEPRECATED_IN_1_0_FOR(f) #endif -#if NM_VERSION_MAX_ALLOWED < NM_VERSION_0_9_10 -# define NM_AVAILABLE_IN_0_9_10 G_UNAVAILABLE(0.9,10) -#else -# define NM_AVAILABLE_IN_0_9_10 -#endif - #if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_0 # define NM_AVAILABLE_IN_1_0 G_UNAVAILABLE(1,0) #else # 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 + +#if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_0_6 +# define NM_AVAILABLE_IN_1_0_6 G_UNAVAILABLE(1,0.6) +#else +# define NM_AVAILABLE_IN_1_0_6 +#endif + #endif /* NM_VERSION_H */