From ca3e1b4d11cd723cf4717524b34b374a0f8307a9 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Sun, 7 Oct 2012 22:06:43 +0100 Subject: [PATCH] 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 file changed, 5 insertions(+) diff --git a/clutter/x11/clutter-x11.h b/clutter/x11/clutter-x11.h index f57e62231..350ef318c 100644 --- a/clutter/x11/clutter-x11.h +++ b/clutter/x11/clutter-x11.h @@ -39,7 +39,12 @@ #include +/* Include clutter-types.h conditionally; users including clutter-x11.h will + * have to include clutter.h as well. + */ +#ifdef CLUTTER_COMPILATION #include +#endif #include #include