From 89a794ec46844aa3c3c3bbdee26b2b07b1219e4d Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Wed, 18 Nov 2015 11:52:53 +0000 Subject: [PATCH] Add version macros for Clutter 1.26 --- clutter/clutter-macros.h | 18 ++++++++++++++++++ clutter/clutter-version.h.in | 10 ++++++++++ 2 files changed, 28 insertions(+) diff --git a/clutter/clutter-macros.h b/clutter/clutter-macros.h index e630207fb..3b5a18edf 100644 --- a/clutter/clutter-macros.h +++ b/clutter/clutter-macros.h @@ -370,4 +370,22 @@ # define CLUTTER_AVAILABLE_IN_1_24 _CLUTTER_EXTERN #endif +#if CLUTTER_VERSION_MIN_REQUIRED >= CLUTTER_VERSION_1_26 +# define CLUTTER_DEPRECATED_IN_1_26 CLUTTER_DEPRECATED +# define CLUTTER_DEPRECATED_IN_1_26_FOR(f) CLUTTER_DEPRECATED_FOR(f) +# define CLUTTER_MACRO_DEPRECATED_IN_1_26 CLUTTER_DEPRECATED_MACRO +# define CLUTTER_MACRO_DEPRECATED_IN_1_26_FOR(f) CLUTTER_DEPRECATED_MACRO_FOR(f) +#else +# define CLUTTER_DEPRECATED_IN_1_26 _CLUTTER_EXTERN +# define CLUTTER_DEPRECATED_IN_1_26_FOR(f) _CLUTTER_EXTERN +# define CLUTTER_MACRO_DEPRECATED_IN_1_26 +# define CLUTTER_MACRO_DEPRECATED_IN_1_26_FOR(f) +#endif + +#if CLUTTER_VERSION_MAX_ALLOWED < CLUTTER_VERSION_1_26 +# define CLUTTER_AVAILABLE_IN_1_26 CLUTTER_UNAVAILABLE(1, 26) +#else +# define CLUTTER_AVAILABLE_IN_1_26 _CLUTTER_EXTERN +#endif + #endif /* __CLUTTER_MACROS_H__ */ diff --git a/clutter/clutter-version.h.in b/clutter/clutter-version.h.in index 29eec45a0..b7a86b686 100644 --- a/clutter/clutter-version.h.in +++ b/clutter/clutter-version.h.in @@ -254,6 +254,16 @@ G_BEGIN_DECLS */ #define CLUTTER_VERSION_1_24 (G_ENCODE_VERSION (1, 24)) +/** + * CLUTTER_VERSION_1_26: + * + * A macro that evaluates to the 1.26 version of Clutter, in a format + * that can be used by the C pre-processor. + * + * Since: 1.26 + */ +#define CLUTTER_VERSION_1_26 (G_ENCODE_VERSION (1, 26)) + /* evaluates to the current stable version; for development cycles, * this means the next stable target */