fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-17 21:00:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

version: remove NM_AVAILABLE_IN_1_4 macros and add NM_AVAILABLE_IN_1_2_4

Browse source 
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.
This commit is contained in:
Thomas Haller 2016-06-10 01:56:21 +02:00
parent 29c7fca5e6
commit ce18cc1b53
2 changed files with 3 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
libnm-core/nm-version.h
View file

@ -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 */

14
libnm-util/nm-version.h
View file

@ -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 */