diff options
| -rw-r--r-- | Makefile.examples | 2 | ||||
| -rw-r--r-- | docs/libnm-glib/Makefile.am | 2 | ||||
| -rw-r--r-- | docs/libnm-util/Makefile.am | 2 | ||||
| -rw-r--r-- | docs/libnm/Makefile.am | 2 | ||||
| -rw-r--r-- | examples/C/glib/meson.build | 2 | ||||
| -rw-r--r-- | libnm-core/nm-version.h | 4 | ||||
| -rw-r--r-- | libnm-util/nm-version.h | 4 | ||||
| -rw-r--r-- | shared/nm-default.h | 2 | ||||
| -rw-r--r-- | shared/nm-version-macros.h.in | 6 |
9 files changed, 14 insertions, 12 deletions
diff --git a/Makefile.examples b/Makefile.examples index d58fd22a22..efbbe289f5 100644 --- a/Makefile.examples +++ b/Makefile.examples @@ -10,7 +10,7 @@ examples_C_glib_cppflags = \ -I$(top_srcdir)/libnm \ -I$(top_builddir)/libnm \ $(GLIB_CFLAGS) \ - -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE + -DNM_VERSION_MAX_ALLOWED=NM_VERSION_CUR_STABLE examples_C_glib_cppflags_gdbus = $(examples_C_glib_cppflags) examples_C_glib_cppflags_libnm = $(examples_C_glib_cppflags) diff --git a/docs/libnm-glib/Makefile.am b/docs/libnm-glib/Makefile.am index 5273148a94..e733f76502 100644 --- a/docs/libnm-glib/Makefile.am +++ b/docs/libnm-glib/Makefile.am @@ -56,7 +56,7 @@ GTKDOC_CFLAGS = \ -I$(top_builddir)/libnm-util \ -I$(top_srcdir)/libnm-glib \ -I$(top_builddir)/libnm-glib \ - -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ + -DNM_VERSION_MAX_ALLOWED=NM_VERSION_CUR_STABLE \ -DNM_VERSION_MIN_REQUIRED=NM_VERSION_0_9_8 \ $(GLIB_CFLAGS) \ $(DBUS_CFLAGS) diff --git a/docs/libnm-util/Makefile.am b/docs/libnm-util/Makefile.am index 75badb7791..eb16d7601e 100644 --- a/docs/libnm-util/Makefile.am +++ b/docs/libnm-util/Makefile.am @@ -50,7 +50,7 @@ extra_files = # if $(DOC_MODULE).types is non-empty. GTKDOC_CFLAGS = \ -I$(top_srcdir)/libnm-util \ - -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ + -DNM_VERSION_MAX_ALLOWED=NM_VERSION_CUR_STABLE \ -DNM_VERSION_MIN_REQUIRED=NM_VERSION_0_9_8 \ $(GLIB_CFLAGS) \ $(DBUS_CFLAGS) diff --git a/docs/libnm/Makefile.am b/docs/libnm/Makefile.am index 3ab55a8c43..362a434455 100644 --- a/docs/libnm/Makefile.am +++ b/docs/libnm/Makefile.am @@ -71,7 +71,7 @@ GTKDOC_CFLAGS = \ -I$(top_builddir)/libnm-core \ -I$(top_srcdir)/libnm \ -I$(top_builddir)/libnm \ - -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ + -DNM_VERSION_MAX_ALLOWED=NM_VERSION_CUR_STABLE \ -DNM_VERSION_MIN_REQUIRED=NM_VERSION_0_9_8 \ $(GLIB_CFLAGS) diff --git a/examples/C/glib/meson.build b/examples/C/glib/meson.build index 0a4694dd52..acc1e71237 100644 --- a/examples/C/glib/meson.build +++ b/examples/C/glib/meson.build @@ -15,6 +15,6 @@ foreach example: examples [example[0] + '.c'] + example[1], include_directories: example[2], dependencies: [nm_core_dep] + example[3], - c_args: '-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE' + c_args: '-DNM_VERSION_MAX_ALLOWED=NM_VERSION_CUR_STABLE' ) endforeach diff --git a/libnm-core/nm-version.h b/libnm-core/nm-version.h index 968fa66384..37d8ea729b 100644 --- a/libnm-core/nm-version.h +++ b/libnm-core/nm-version.h @@ -38,8 +38,8 @@ #endif /* sanity checks */ -#if NM_VERSION_MIN_REQUIRED > NM_VERSION_NEXT_STABLE -#error "NM_VERSION_MIN_REQUIRED must be <= NM_VERSION_NEXT_STABLE" +#if NM_VERSION_MIN_REQUIRED > NM_VERSION_CUR_STABLE +#error "NM_VERSION_MIN_REQUIRED must be <= NM_VERSION_CUR_STABLE" #endif #if NM_VERSION_MAX_ALLOWED < NM_VERSION_MIN_REQUIRED #error "NM_VERSION_MAX_ALLOWED must be >= NM_VERSION_MIN_REQUIRED" diff --git a/libnm-util/nm-version.h b/libnm-util/nm-version.h index 7173bc6ba3..5f3bd022a1 100644 --- a/libnm-util/nm-version.h +++ b/libnm-util/nm-version.h @@ -38,8 +38,8 @@ #endif /* sanity checks */ -#if NM_VERSION_MIN_REQUIRED > NM_VERSION_NEXT_STABLE -#error "NM_VERSION_MIN_REQUIRED must be <= NM_VERSION_NEXT_STABLE" +#if NM_VERSION_MIN_REQUIRED > NM_VERSION_CUR_STABLE +#error "NM_VERSION_MIN_REQUIRED must be <= NM_VERSION_CUR_STABLE" #endif #if NM_VERSION_MAX_ALLOWED < NM_VERSION_MIN_REQUIRED #error "NM_VERSION_MAX_ALLOWED must be >= NM_VERSION_MIN_REQUIRED" diff --git a/shared/nm-default.h b/shared/nm-default.h index 2e205a957e..0ddad504ce 100644 --- a/shared/nm-default.h +++ b/shared/nm-default.h @@ -115,7 +115,7 @@ /* for internal compilation we don't want the deprecation macros * to be in effect. Define the widest range of versions to effectively * disable deprecation checks */ -#define NM_VERSION_MAX_ALLOWED NM_VERSION_NEXT_STABLE +#define NM_VERSION_MAX_ALLOWED NM_VERSION_CUR_STABLE #define NM_VERSION_MIN_REQUIRED NM_VERSION_0_9_8 #ifndef NM_MORE_ASSERTS diff --git a/shared/nm-version-macros.h.in b/shared/nm-version-macros.h.in index 3efa350cd5..0cbd1b0bdd 100644 --- a/shared/nm-version-macros.h.in +++ b/shared/nm-version-macros.h.in @@ -74,8 +74,10 @@ #define NM_VERSION_1_10 (NM_ENCODE_VERSION (1, 10, 0)) #define NM_VERSION_1_12 (NM_ENCODE_VERSION (1, 12, 0)) -#define NM_VERSION_CUR_STABLE NM_VERSION_1_10 -#define NM_VERSION_NEXT_STABLE NM_VERSION_1_12 +#define NM_VERSION_CUR_STABLE NM_VERSION_1_12 + +/* deprecated define. */ +#define NM_VERSION_NEXT_STABLE NM_VERSION_CUR_STABLE #define NM_VERSION NM_ENCODE_VERSION (NM_MAJOR_VERSION, NM_MINOR_VERSION, NM_MICRO_VERSION) |