diff options
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | libnm-core/nm-version.h | 14 | ||||
| -rw-r--r-- | libnm-util/nm-version.h | 14 | ||||
| -rw-r--r-- | shared/nm-version-macros.h.in | 5 |
4 files changed, 33 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index ab0331272c..13bbae5c57 100644 --- a/configure.ac +++ b/configure.ac @@ -2,8 +2,8 @@ AC_PREREQ([2.63]) dnl The NM version number m4_define([nm_major_version], [1]) -m4_define([nm_minor_version], [5]) -m4_define([nm_micro_version], [90]) +m4_define([nm_minor_version], [7]) +m4_define([nm_micro_version], [0]) m4_define([nm_version], [nm_major_version.nm_minor_version.nm_micro_version]) diff --git a/libnm-core/nm-version.h b/libnm-core/nm-version.h index aa92c3f813..8d4dd9c030 100644 --- a/libnm-core/nm-version.h +++ b/libnm-core/nm-version.h @@ -118,4 +118,18 @@ # define NM_AVAILABLE_IN_1_6 #endif +#if NM_VERSION_MIN_REQUIRED >= NM_VERSION_1_8 +# define NM_DEPRECATED_IN_1_8 G_DEPRECATED +# define NM_DEPRECATED_IN_1_8_FOR(f) G_DEPRECATED_FOR(f) +#else +# define NM_DEPRECATED_IN_1_8 +# define NM_DEPRECATED_IN_1_8_FOR(f) +#endif + +#if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_8 +# define NM_AVAILABLE_IN_1_8 G_UNAVAILABLE(1,8) +#else +# define NM_AVAILABLE_IN_1_8 +#endif + #endif /* NM_VERSION_H */ diff --git a/libnm-util/nm-version.h b/libnm-util/nm-version.h index b8b32306e0..a44d44e607 100644 --- a/libnm-util/nm-version.h +++ b/libnm-util/nm-version.h @@ -118,4 +118,18 @@ # define NM_AVAILABLE_IN_1_6 #endif +#if NM_VERSION_MIN_REQUIRED >= NM_VERSION_1_8 +# define NM_DEPRECATED_IN_1_8 G_DEPRECATED +# define NM_DEPRECATED_IN_1_8_FOR(f) G_DEPRECATED_FOR(f) +#else +# define NM_DEPRECATED_IN_1_8 +# define NM_DEPRECATED_IN_1_8_FOR(f) +#endif + +#if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_8 +# define NM_AVAILABLE_IN_1_8 G_UNAVAILABLE(1,8) +#else +# define NM_AVAILABLE_IN_1_8 +#endif + #endif /* NM_VERSION_H */ diff --git a/shared/nm-version-macros.h.in b/shared/nm-version-macros.h.in index 169e49508d..43ba668604 100644 --- a/shared/nm-version-macros.h.in +++ b/shared/nm-version-macros.h.in @@ -70,9 +70,10 @@ #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_1_6 (NM_ENCODE_VERSION (1, 6, 0)) +#define NM_VERSION_1_8 (NM_ENCODE_VERSION (1, 8, 0)) -#define NM_VERSION_CUR_STABLE NM_VERSION_1_4 -#define NM_VERSION_NEXT_STABLE NM_VERSION_1_6 +#define NM_VERSION_CUR_STABLE NM_VERSION_1_6 +#define NM_VERSION_NEXT_STABLE NM_VERSION_1_8 #define NM_VERSION NM_ENCODE_VERSION (NM_MAJOR_VERSION, NM_MINOR_VERSION, NM_MICRO_VERSION) |