From 94b74c761d187680d8427844188202bbb781842e Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Fri, 17 Sep 2021 11:35:21 +0100 Subject: [PATCH] gversionmacros: Add version macros for GLib 2.72 Signed-off-by: Philip Withnall --- docs/reference/gio/gio-docs.xml | 4 +++ docs/reference/glib/glib-docs.xml | 4 +++ docs/reference/glib/glib-sections.txt | 14 ++++++++ docs/reference/gobject/gobject-docs.xml | 4 +++ docs/reference/meson.build | 2 +- glib/gversionmacros.h | 44 +++++++++++++++++++++++++ 6 files changed, 71 insertions(+), 1 deletion(-) diff --git a/docs/reference/gio/gio-docs.xml b/docs/reference/gio/gio-docs.xml index b1537baf6..2986f9d64 100644 --- a/docs/reference/gio/gio-docs.xml +++ b/docs/reference/gio/gio-docs.xml @@ -394,6 +394,10 @@ Index of new symbols in 2.70 + + Index of new symbols in 2.72 + + diff --git a/docs/reference/glib/glib-docs.xml b/docs/reference/glib/glib-docs.xml index 2f5de9e31..e642f4e93 100644 --- a/docs/reference/glib/glib-docs.xml +++ b/docs/reference/glib/glib-docs.xml @@ -292,6 +292,10 @@ Index of new symbols in 2.70 + + Index of new symbols in 2.72 + + diff --git a/docs/reference/glib/glib-sections.txt b/docs/reference/glib/glib-sections.txt index efb261bfd..eff14e1ea 100644 --- a/docs/reference/glib/glib-sections.txt +++ b/docs/reference/glib/glib-sections.txt @@ -139,6 +139,7 @@ GLIB_VERSION_2_64 GLIB_VERSION_2_66 GLIB_VERSION_2_68 GLIB_VERSION_2_70 +GLIB_VERSION_2_72 GLIB_VERSION_CUR_STABLE GLIB_VERSION_PREV_STABLE GLIB_VERSION_MIN_REQUIRED @@ -170,6 +171,7 @@ GLIB_AVAILABLE_ENUMERATOR_IN_2_64 GLIB_AVAILABLE_ENUMERATOR_IN_2_66 GLIB_AVAILABLE_ENUMERATOR_IN_2_68 GLIB_AVAILABLE_ENUMERATOR_IN_2_70 +GLIB_AVAILABLE_ENUMERATOR_IN_2_72 GLIB_AVAILABLE_IN_ALL GLIB_AVAILABLE_IN_2_26 GLIB_AVAILABLE_IN_2_28 @@ -194,6 +196,7 @@ GLIB_AVAILABLE_IN_2_64 GLIB_AVAILABLE_IN_2_66 GLIB_AVAILABLE_IN_2_68 GLIB_AVAILABLE_IN_2_70 +GLIB_AVAILABLE_IN_2_72 GLIB_AVAILABLE_MACRO_IN_2_26 GLIB_AVAILABLE_MACRO_IN_2_28 GLIB_AVAILABLE_MACRO_IN_2_30 @@ -217,6 +220,7 @@ GLIB_AVAILABLE_MACRO_IN_2_64 GLIB_AVAILABLE_MACRO_IN_2_66 GLIB_AVAILABLE_MACRO_IN_2_68 GLIB_AVAILABLE_MACRO_IN_2_70 +GLIB_AVAILABLE_MACRO_IN_2_72 GLIB_AVAILABLE_STATIC_INLINE_IN_2_44 GLIB_AVAILABLE_STATIC_INLINE_IN_2_60 GLIB_AVAILABLE_STATIC_INLINE_IN_2_62 @@ -224,6 +228,7 @@ GLIB_AVAILABLE_STATIC_INLINE_IN_2_64 GLIB_AVAILABLE_STATIC_INLINE_IN_2_66 GLIB_AVAILABLE_STATIC_INLINE_IN_2_68 GLIB_AVAILABLE_STATIC_INLINE_IN_2_70 +GLIB_AVAILABLE_STATIC_INLINE_IN_2_72 GLIB_AVAILABLE_TYPE_IN_2_26 GLIB_AVAILABLE_TYPE_IN_2_28 GLIB_AVAILABLE_TYPE_IN_2_30 @@ -247,6 +252,7 @@ GLIB_AVAILABLE_TYPE_IN_2_64 GLIB_AVAILABLE_TYPE_IN_2_66 GLIB_AVAILABLE_TYPE_IN_2_68 GLIB_AVAILABLE_TYPE_IN_2_70 +GLIB_AVAILABLE_TYPE_IN_2_72 GLIB_DEPRECATED_ENUMERATOR GLIB_DEPRECATED_ENUMERATOR_FOR GLIB_DEPRECATED_ENUMERATOR_IN_2_26 @@ -295,6 +301,8 @@ GLIB_DEPRECATED_ENUMERATOR_IN_2_68 GLIB_DEPRECATED_ENUMERATOR_IN_2_68_FOR GLIB_DEPRECATED_ENUMERATOR_IN_2_70 GLIB_DEPRECATED_ENUMERATOR_IN_2_70_FOR +GLIB_DEPRECATED_ENUMERATOR_IN_2_72 +GLIB_DEPRECATED_ENUMERATOR_IN_2_72_FOR GLIB_DEPRECATED_IN_2_26 GLIB_DEPRECATED_IN_2_26_FOR GLIB_DEPRECATED_IN_2_28 @@ -341,6 +349,8 @@ GLIB_DEPRECATED_IN_2_68 GLIB_DEPRECATED_IN_2_68_FOR GLIB_DEPRECATED_IN_2_70 GLIB_DEPRECATED_IN_2_70_FOR +GLIB_DEPRECATED_IN_2_72 +GLIB_DEPRECATED_IN_2_72_FOR GLIB_DEPRECATED_MACRO GLIB_DEPRECATED_MACRO_FOR GLIB_DEPRECATED_MACRO_IN_2_26 @@ -389,6 +399,8 @@ GLIB_DEPRECATED_MACRO_IN_2_68 GLIB_DEPRECATED_MACRO_IN_2_68_FOR GLIB_DEPRECATED_MACRO_IN_2_70 GLIB_DEPRECATED_MACRO_IN_2_70_FOR +GLIB_DEPRECATED_MACRO_IN_2_72 +GLIB_DEPRECATED_MACRO_IN_2_72_FOR GLIB_DEPRECATED_TYPE GLIB_DEPRECATED_TYPE_FOR GLIB_DEPRECATED_TYPE_IN_2_26 @@ -437,6 +449,8 @@ GLIB_DEPRECATED_TYPE_IN_2_68 GLIB_DEPRECATED_TYPE_IN_2_68_FOR GLIB_DEPRECATED_TYPE_IN_2_70 GLIB_DEPRECATED_TYPE_IN_2_70_FOR +GLIB_DEPRECATED_TYPE_IN_2_72 +GLIB_DEPRECATED_TYPE_IN_2_72_FOR GLIB_VERSION_CUR_STABLE GLIB_VERSION_PREV_STABLE diff --git a/docs/reference/gobject/gobject-docs.xml b/docs/reference/gobject/gobject-docs.xml index e8e7c76d9..3a83bd1a6 100644 --- a/docs/reference/gobject/gobject-docs.xml +++ b/docs/reference/gobject/gobject-docs.xml @@ -212,6 +212,10 @@ Index of new symbols in 2.70 + + Index of new symbols in 2.72 + + diff --git a/docs/reference/meson.build b/docs/reference/meson.build index 53ca12ff8..8128e21bf 100644 --- a/docs/reference/meson.build +++ b/docs/reference/meson.build @@ -7,7 +7,7 @@ stable_2_series_versions = [ '26', '28', '30', '32', '34', '36', '38', '40', '42', '44', '46', '48', '50', '52', '54', '56', '58', - '60', '62', '64', '66', '68', '70', + '60', '62', '64', '66', '68', '70', '72', ] ignore_decorators = [ diff --git a/glib/gversionmacros.h b/glib/gversionmacros.h index d052709cf..e08c80901 100644 --- a/glib/gversionmacros.h +++ b/glib/gversionmacros.h @@ -265,6 +265,16 @@ */ #define GLIB_VERSION_2_70 (G_ENCODE_VERSION (2, 70)) +/** + * GLIB_VERSION_2_72: + * + * A macro that evaluates to the 2.72 version of GLib, in a format + * that can be used by the C pre-processor. + * + * Since: 2.72 + */ +#define GLIB_VERSION_2_72 (G_ENCODE_VERSION (2, 72)) + /** * GLIB_VERSION_CUR_STABLE: * @@ -1120,4 +1130,38 @@ # define GLIB_AVAILABLE_TYPE_IN_2_70 #endif +#if GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_72 +# define GLIB_DEPRECATED_IN_2_72 GLIB_DEPRECATED +# define GLIB_DEPRECATED_IN_2_72_FOR(f) GLIB_DEPRECATED_FOR(f) +# define GLIB_DEPRECATED_MACRO_IN_2_72 GLIB_DEPRECATED_MACRO +# define GLIB_DEPRECATED_MACRO_IN_2_72_FOR(f) GLIB_DEPRECATED_MACRO_FOR(f) +# define GLIB_DEPRECATED_ENUMERATOR_IN_2_72 GLIB_DEPRECATED_ENUMERATOR +# define GLIB_DEPRECATED_ENUMERATOR_IN_2_72_FOR(f) GLIB_DEPRECATED_ENUMERATOR_FOR(f) +# define GLIB_DEPRECATED_TYPE_IN_2_72 GLIB_DEPRECATED_TYPE +# define GLIB_DEPRECATED_TYPE_IN_2_72_FOR(f) GLIB_DEPRECATED_TYPE_FOR(f) +#else +# define GLIB_DEPRECATED_IN_2_72 _GLIB_EXTERN +# define GLIB_DEPRECATED_IN_2_72_FOR(f) _GLIB_EXTERN +# define GLIB_DEPRECATED_MACRO_IN_2_72 +# define GLIB_DEPRECATED_MACRO_IN_2_72_FOR(f) +# define GLIB_DEPRECATED_ENUMERATOR_IN_2_72 +# define GLIB_DEPRECATED_ENUMERATOR_IN_2_72_FOR(f) +# define GLIB_DEPRECATED_TYPE_IN_2_72 +# define GLIB_DEPRECATED_TYPE_IN_2_72_FOR(f) +#endif + +#if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_72 +# define GLIB_AVAILABLE_IN_2_72 GLIB_UNAVAILABLE(2, 72) +# define GLIB_AVAILABLE_STATIC_INLINE_IN_2_72 GLIB_UNAVAILABLE_STATIC_INLINE(2, 72) +# define GLIB_AVAILABLE_MACRO_IN_2_72 GLIB_UNAVAILABLE_MACRO(2, 72) +# define GLIB_AVAILABLE_ENUMERATOR_IN_2_72 GLIB_UNAVAILABLE_ENUMERATOR(2, 72) +# define GLIB_AVAILABLE_TYPE_IN_2_72 GLIB_UNAVAILABLE_TYPE(2, 72) +#else +# define GLIB_AVAILABLE_IN_2_72 _GLIB_EXTERN +# define GLIB_AVAILABLE_STATIC_INLINE_IN_2_72 +# define GLIB_AVAILABLE_MACRO_IN_2_72 +# define GLIB_AVAILABLE_ENUMERATOR_IN_2_72 +# define GLIB_AVAILABLE_TYPE_IN_2_72 +#endif + #endif /* __G_VERSION_MACROS_H__ */