diff options
| author | Thomas Haller <thaller@redhat.com> | 2014-06-27 19:07:09 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2014-06-27 20:39:05 +0200 |
| commit | 87c48023f149d70d031def5150c1093f07e33178 (patch) | |
| tree | 1e8a423b593c0271f513f9439a38a8eee30d093c | |
| parent | 3e9b6666de4926c30c87e2371008670bdbf18cd0 (diff) | |
libnm-util, libnm-glib: add NM_VERSION_1_0, NM_DEPRECATED_IN_1_0, and NM_DEPRECATED_IN_1_0 macros
Signed-off-by: Thomas Haller <thaller@redhat.com>
| -rw-r--r-- | include/nm-version.h.in | 28 |
1 files changed, 17 insertions, 11 deletions
diff --git a/include/nm-version.h.in b/include/nm-version.h.in index 711bfa9f01..e702ae8bb2 100644 --- a/include/nm-version.h.in +++ b/include/nm-version.h.in @@ -66,18 +66,10 @@ #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)) -#if (NM_MICRO_VERSION % 2) -#define NM_VERSION_CUR_STABLE (NM_ENCODE_VERSION (NM_MAJOR_VERSION, NM_MINOR_VERSION, NM_MICRO_VERSION - 1)) -#else -#define NM_VERSION_CUR_STABLE (NM_ENCODE_VERSION (NM_MAJOR_VERSION, NM_MINOR_VERSION, NM_MICRO_VERSION)) -#endif - -#if (NM_MICRO_VERSION % 2) -#define NM_VERSION_NEXT_STABLE (NM_ENCODE_VERSION (NM_MAJOR_VERSION, NM_MINOR_VERSION, NM_MICRO_VERSION +1)) -#else -#define NM_VERSION_NEXT_STABLE (NM_ENCODE_VERSION (NM_MAJOR_VERSION, NM_MINOR_VERSION, NM_MICRO_VERSION + 2)) -#endif +#define NM_VERSION_CUR_STABLE NM_VERSION_0_9_10 +#define NM_VERSION_NEXT_STABLE NM_VERSION_1_0 #if !defined (NM_VERSION_MIN_REQUIRED) || (NM_VERSION_MIN_REQUIRED == 0) # undef NM_VERSION_MIN_REQUIRED @@ -108,11 +100,25 @@ # define NM_DEPRECATED_IN_0_9_10_FOR(f) #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) +#else +# define NM_DEPRECATED_IN_1_0 +# 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 + #endif /* NM_VERSION_H */ |