From ce18cc1b539b5674e5a16929e70489a356d64b59 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 10 Jun 2016 01:56:21 +0200 Subject: [PATCH] version: remove NM_AVAILABLE_IN_1_4 macros and add NM_AVAILABLE_IN_1_2_4 The NM_AVAILABLE_IN_* and NM_DEPRECATED_IN_* macros are kinda internal macros to mark public API (although they are in public headers). On 1.2 branch, we will never add a new API that is marked with one of the 1.4 macros, because from 1.2's point of view 1.4 does not exist. Remove those macros, but add instead a 1.2.4 macro that we will use. --- libnm-core/nm-version.h | 14 +++----------- libnm-util/nm-version.h | 14 -------------- 2 files changed, 3 insertions(+), 25 deletions(-) diff --git a/libnm-core/nm-version.h b/libnm-core/nm-version.h index d7f112bf93..3b448819e4 100644 --- a/libnm-core/nm-version.h +++ b/libnm-core/nm-version.h @@ -90,18 +90,10 @@ # define NM_AVAILABLE_IN_1_2 #endif -#if NM_VERSION_MIN_REQUIRED >= NM_VERSION_1_4 -# define NM_DEPRECATED_IN_1_4 G_DEPRECATED -# define NM_DEPRECATED_IN_1_4_FOR(f) G_DEPRECATED_FOR(f) +#if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_2_4 +# define NM_AVAILABLE_IN_1_2_4 G_UNAVAILABLE(1.2,4) #else -# define NM_DEPRECATED_IN_1_4 -# define NM_DEPRECATED_IN_1_4_FOR(f) -#endif - -#if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_4 -# define NM_AVAILABLE_IN_1_4 G_UNAVAILABLE(1,4) -#else -# define NM_AVAILABLE_IN_1_4 +# define NM_AVAILABLE_IN_1_2_4 #endif #endif /* NM_VERSION_H */ diff --git a/libnm-util/nm-version.h b/libnm-util/nm-version.h index 760151a68f..fd94e210ee 100644 --- a/libnm-util/nm-version.h +++ b/libnm-util/nm-version.h @@ -90,18 +90,4 @@ # define NM_AVAILABLE_IN_1_2 #endif -#if NM_VERSION_MIN_REQUIRED >= NM_VERSION_1_4 -# define NM_DEPRECATED_IN_1_4 G_DEPRECATED -# define NM_DEPRECATED_IN_1_4_FOR(f) G_DEPRECATED_FOR(f) -#else -# define NM_DEPRECATED_IN_1_4 -# define NM_DEPRECATED_IN_1_4_FOR(f) -#endif - -#if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_4 -# define NM_AVAILABLE_IN_1_4 G_UNAVAILABLE(1,4) -#else -# define NM_AVAILABLE_IN_1_4 -#endif - #endif /* NM_VERSION_H */