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.
This commit is contained in:
parent
671ead6681
commit
66cc330c0b
@ -65,7 +65,7 @@ void clutter_backend_set_font_options (ClutterBa
|
|||||||
const cairo_font_options_t *options);
|
const cairo_font_options_t *options);
|
||||||
const cairo_font_options_t *clutter_backend_get_font_options (ClutterBackend *backend);
|
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);
|
CoglContext *clutter_backend_get_cogl_context (ClutterBackend *backend);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user