[mutter/wip/frame-synchronization: 64/69] Enable CLUTTER / COGL_ENABLE_EXPERIMENTAL_API globally

[Owen Taylor <otaylor src gnome org>]

commit f2750585dc7012bfbffa93d1ae67e255be5f7024
Author: Owen W. Taylor <otaylor fishsoup net>
Date:   Mon Nov 12 13:32:30 2012 -0500

    Enable CLUTTER / COGL_ENABLE_EXPERIMENTAL_API globally
    
    Instead of defining CLUTTER_ENABLE_EXPERIMENTAL_API and
    COGL_ENABLE_EXPERIMENTAL_API in individual source files, enable
    them on the command line. We weren't tracking exactly what pieces of
    experimental API we were using and we were using the experimental
    API in most source files that used Clutter and Cogl, so the
    local #defines were annoying rather than useful.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=685463

 src/Makefile.am                         |    2 ++
 src/compositor/meta-background-actor.c  |    2 --
 src/compositor/meta-shaped-texture.c    |    3 ---
 src/compositor/meta-texture-rectangle.c |    3 ---
 src/compositor/meta-window-actor.c      |    1 -
 5 files changed, 2 insertions(+), 9 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 9071d1a..6a15c8a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,6 +6,8 @@ lib_LTLIBRARIES = libmutter.la
 SUBDIRS=wm-tester tools compositor/plugins
 
 INCLUDES=								\
+	-DCLUTTER_ENABLE_EXPERIMENTAL_API				\
+	-DCOGL_ENABLE_EXPERIMENTAL_API					\
 	$(MUTTER_CFLAGS)						\
 	-I$(srcdir)							\
 	-I$(srcdir)/core						\
diff --git a/src/compositor/meta-background-actor.c b/src/compositor/meta-background-actor.c
index 0f5840d..f9140c8 100644
--- a/src/compositor/meta-background-actor.c
+++ b/src/compositor/meta-background-actor.c
@@ -25,10 +25,8 @@
 
 #include <config.h>
 
-#define COGL_ENABLE_EXPERIMENTAL_API
 #include <cogl/cogl-texture-pixmap-x11.h>
 
-#define CLUTTER_ENABLE_EXPERIMENTAL_API
 #include <clutter/clutter.h>
 
 #include <X11/Xatom.h>
diff --git a/src/compositor/meta-shaped-texture.c b/src/compositor/meta-shaped-texture.c
index a5fce04..0d10f48 100644
--- a/src/compositor/meta-shaped-texture.c
+++ b/src/compositor/meta-shaped-texture.c
@@ -27,9 +27,6 @@
 
 #include <config.h>
 
-#define CLUTTER_ENABLE_EXPERIMENTAL_API
-#define COGL_ENABLE_EXPERIMENTAL_API
-
 #include <meta/meta-shaped-texture.h>
 #include "meta-texture-tower.h"
 
diff --git a/src/compositor/meta-texture-rectangle.c b/src/compositor/meta-texture-rectangle.c
index af6817f..168e09b 100644
--- a/src/compositor/meta-texture-rectangle.c
+++ b/src/compositor/meta-texture-rectangle.c
@@ -25,9 +25,6 @@
 
 #include <config.h>
 
-#define CLUTTER_ENABLE_EXPERIMENTAL_API
-#define COGL_ENABLE_EXPERIMENTAL_API
-
 #include <clutter/clutter.h>
 #include "meta-texture-rectangle.h"
 
diff --git a/src/compositor/meta-window-actor.c b/src/compositor/meta-window-actor.c
index 00bb01e..ca244a4 100644
--- a/src/compositor/meta-window-actor.c
+++ b/src/compositor/meta-window-actor.c
@@ -10,7 +10,6 @@
 #include <X11/extensions/Xrender.h>
 
 #include <clutter/x11/clutter-x11.h>
-#define COGL_ENABLE_EXPERIMENTAL_API
 #include <cogl/cogl-texture-pixmap-x11.h>
 #include <gdk/gdk.h> /* for gdk_rectangle_union() */
 #include <string.h>