From 66cc330c0b4db8de6c819926318744c7f83e1b15 Mon Sep 17 00:00:00 2001 From: Robert Bragg Date: Tue, 21 Feb 2012 14:01:22 +0000 Subject: [PATCH] Loosen the guard around clutter_backend_get_cogl_context We were only exposing clutter_backend_get_cogl_context() if COGL_ENABLE_EXPERIMENTAL_2_0_API had been defined but the CoglContext api is also available if COGL_ENABLE_EXPERIMENTAL_API has been defined. As it was it meant that code opting into the experimental Cogl api but not limiting to the 2.0 only api would have to #define COGL_ENABLE_EXPERIMENTAL_2_0_API before including clutter.h but make sure it wasn't defined when including cogl.h which was particularly awkward. --- clutter/clutter-backend.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clutter/clutter-backend.h b/clutter/clutter-backend.h index bea507cf7..8f8f7e9e8 100644 --- a/clutter/clutter-backend.h +++ b/clutter/clutter-backend.h @@ -65,7 +65,7 @@ void clutter_backend_set_font_options (ClutterBa const cairo_font_options_t *options); const cairo_font_options_t *clutter_backend_get_font_options (ClutterBackend *backend); -#if defined (COGL_ENABLE_EXPERIMENTAL_2_0_API) && defined (CLUTTER_ENABLE_EXPERIMENTAL_API) +#if defined (COGL_ENABLE_EXPERIMENTAL_API) && defined (CLUTTER_ENABLE_EXPERIMENTAL_API) CoglContext *clutter_backend_get_cogl_context (ClutterBackend *backend); #endif