diff options
author | Beniamino Galvani <bgalvani@redhat.com> | 2017-11-03 16:05:12 +0100 |
---|---|---|
committer | Beniamino Galvani <bgalvani@redhat.com> | 2017-11-03 16:05:12 +0100 |
commit | c2c44d16f40bd3cd769d8073d13a3e2009cf59b2 (patch) | |
tree | 84fe0d8cd50b0a62bd68a4eef63e70df434a3cb9 | |
parent | de6b348bfcb34706213c2182f5fe9a4920f7fdd4 (diff) | |
download | NetworkManager-c2c44d16f40bd3cd769d8073d13a3e2009cf59b2.tar.gz |
release: bump version to 1.11.0 (development)1.11.0-dev
-rw-r--r-- | configure.ac | 4 | ||||
-rw-r--r-- | libnm-core/nm-version.h | 14 |
2 files changed, 16 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 3e413140a5..061c7738e3 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], [9]) -m4_define([nm_micro_version], [90]) +m4_define([nm_minor_version], [11]) +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 f6bfaf720c..968fa66384 100644 --- a/libnm-core/nm-version.h +++ b/libnm-core/nm-version.h @@ -146,4 +146,18 @@ # define NM_AVAILABLE_IN_1_10 #endif +#if NM_VERSION_MIN_REQUIRED >= NM_VERSION_1_12 +# define NM_DEPRECATED_IN_1_12 G_DEPRECATED +# define NM_DEPRECATED_IN_1_12_FOR(f) G_DEPRECATED_FOR(f) +#else +# define NM_DEPRECATED_IN_1_12 +# define NM_DEPRECATED_IN_1_12_FOR(f) +#endif + +#if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_12 +# define NM_AVAILABLE_IN_1_12 G_UNAVAILABLE(1,12) +#else +# define NM_AVAILABLE_IN_1_12 +#endif + #endif /* NM_VERSION_H */ |