From 534e994972bc7b956c13d2f80ededa41a4f9e05d Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Tue, 19 Feb 2013 19:53:43 -0500 Subject: [PATCH] Don't do anything special with COGL_ENABLE_EXPERIMENTAL_2_0_API This flag solely disables deprecated Cogl 1.0 API, so it shouldn't be used for feature checks. https://bugzilla.gnome.org/show_bug.cgi?id=694229 --- clutter/clutter-backend.h | 2 +- clutter/clutter-paint-node.h | 4 ++-- clutter/clutter-paint-nodes.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/clutter/clutter-backend.h b/clutter/clutter-backend.h index 8f8f7e9e8..474c4264e 100644 --- a/clutter/clutter-backend.h +++ b/clutter/clutter-backend.h @@ -31,7 +31,7 @@ #include #include -#ifdef COGL_ENABLE_EXPERIMENTAL_2_0_API +#ifdef COGL_ENABLE_EXPERIMENTAL_API #include #endif diff --git a/clutter/clutter-paint-node.h b/clutter/clutter-paint-node.h index 9d3ffb6e8..534b39d8d 100644 --- a/clutter/clutter-paint-node.h +++ b/clutter/clutter-paint-node.h @@ -66,14 +66,14 @@ void clutter_paint_node_add_texture_rectangle (Clutter float y_1, float x_2, float y_2); -#if defined(COGL_ENABLE_EXPERIMENTAL_2_0_API) && defined(CLUTTER_ENABLE_EXPERIMENTAL_API) +#if defined(COGL_ENABLE_EXPERIMENTAL_API) && defined(CLUTTER_ENABLE_EXPERIMENTAL_API) CLUTTER_AVAILABLE_IN_1_10 void clutter_paint_node_add_path (ClutterPaintNode *node, CoglPath *path); CLUTTER_AVAILABLE_IN_1_10 void clutter_paint_node_add_primitive (ClutterPaintNode *node, CoglPrimitive *primitive); -#endif /* COGL_ENABLE_EXPERIMENTAL_2_0_API && CLUTTER_ENABLE_EXPERIMENTAL_API */ +#endif /* COGL_ENABLE_EXPERIMENTAL_API && CLUTTER_ENABLE_EXPERIMENTAL_API */ /** * CLUTTER_VALUE_HOLDS_PAINT_NODE: diff --git a/clutter/clutter-paint-nodes.h b/clutter/clutter-paint-nodes.h index 75a1ee3eb..bd854e816 100644 --- a/clutter/clutter-paint-nodes.h +++ b/clutter/clutter-paint-nodes.h @@ -118,10 +118,10 @@ typedef struct _ClutterPipelineNodeClass ClutterPipelineNodeClass; CLUTTER_AVAILABLE_IN_1_10 GType clutter_pipeline_node_get_type (void) G_GNUC_CONST; -#if defined(COGL_ENABLE_EXPERIMENTAL_2_0_API) && defined(CLUTTER_ENABLE_EXPERIMENTAL_API) +#if defined(COGL_ENABLE_EXPERIMENTAL_API) && defined(CLUTTER_ENABLE_EXPERIMENTAL_API) CLUTTER_AVAILABLE_IN_1_10 ClutterPaintNode * clutter_pipeline_node_new (CoglPipeline *pipeline); -#endif /* COGL_ENABLE_EXPERIMENTAL_2_0_API && CLUTTER_ENABLE_EXPERIMENTAL_API */ +#endif /* COGL_ENABLE_EXPERIMENTAL_API && CLUTTER_ENABLE_EXPERIMENTAL_API */ #define CLUTTER_TYPE_TEXT_NODE (clutter_text_node_get_type ()) #define CLUTTER_TEXT_NODE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_TEXT_NODE, ClutterTextNode))