From 0c391382008158f3578698fb597edf6e10d90124 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Thu, 10 Oct 2013 13:31:28 +0100 Subject: [PATCH] Add 1.18 version macros We're still going to do a 1.x release cycle. --- clutter/clutter-macros.h | 14 ++++++++++++++ clutter/clutter-version.h.in | 12 +++++++++++- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/clutter/clutter-macros.h b/clutter/clutter-macros.h index db797d9a4..20c447855 100644 --- a/clutter/clutter-macros.h +++ b/clutter/clutter-macros.h @@ -290,4 +290,18 @@ # define CLUTTER_AVAILABLE_IN_1_16 #endif +#if CLUTTER_VERSION_MIN_REQUIRED >= CLUTTER_VERSION_1_18 +# define CLUTTER_DEPRECATED_IN_1_18 CLUTTER_DEPRECATED +# define CLUTTER_DEPRECATED_IN_1_18_FOR(f) CLUTTER_DEPRECATED_FOR(f) +#else +# define CLUTTER_DEPRECATED_IN_1_18 +# define CLUTTER_DEPRECATED_IN_1_18_FOR(f) +#endif + +#if CLUTTER_VERSION_MAX_ALLOWED < CLUTTER_VERSION_1_18 +# define CLUTTER_AVAILABLE_IN_1_18 CLUTTER_UNAVAILABLE(1, 18) +#else +# define CLUTTER_AVAILABLE_IN_1_18 +#endif + #endif /* __CLUTTER_MACROS_H__ */ diff --git a/clutter/clutter-version.h.in b/clutter/clutter-version.h.in index a4703e120..44114c9c5 100644 --- a/clutter/clutter-version.h.in +++ b/clutter/clutter-version.h.in @@ -210,10 +210,20 @@ G_BEGIN_DECLS * A macro that evaluates to the 1.16 version of Clutter, in a format * that can be used by the C pre-processor. * - * Since: 1.14 + * Since: 1.16 */ #define CLUTTER_VERSION_1_16 (G_ENCODE_VERSION (1, 16)) +/** + * CLUTTER_VERSION_1_18: + * + * A macro that evaluates to the 1.18 version of Clutter, in a format + * that can be used by the C pre-processor. + * + * Since: 1.18 + */ +#define CLUTTER_VERSION_1_18 (G_ENCODE_VERSION (1, 18)) + /* evaluates to the current stable version; for development cycles, * this means the next stable target */