[clutter/wip/clutter-1.99: 191/195] 2.0: Include clutter headers conditionally in clutter-x11.h

[Emmanuele Bassi <ebassi src gnome org>]

commit 39f3dcc0fce26437ba47bdc1e5747d1f79e99961
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Sun Oct 7 22:06:43 2012 +0100

    2.0: Include clutter headers conditionally in clutter-x11.h
    
    We want to avoid clutter-x11.h leaking Clutter symbols (i.e. you need to
    include clutter.h yourself before including clutter-x11.h), but we need
    to do so conditionally, so that ancillary stuff like gtk-doc and
    g-ir-scanner get the right types while building Clutter itself.

 clutter/x11/clutter-x11.h |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
---
diff --git a/clutter/x11/clutter-x11.h b/clutter/x11/clutter-x11.h
index f57e622..350ef31 100644
--- a/clutter/x11/clutter-x11.h
+++ b/clutter/x11/clutter-x11.h
@@ -39,7 +39,12 @@
 
 #include <glib.h>
 
+/* Include clutter-types.h conditionally; users including clutter-x11.h will
+ * have to include clutter.h as well.
+ */
+#ifdef CLUTTER_COMPILATION
 #include <clutter/clutter-types.h>
+#endif
 
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>