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.
This commit is contained in:
parent
b4758c3526
commit
ca3e1b4d11
@ -39,7 +39,12 @@
|
|||||||
|
|
||||||
#include <glib.h>
|
#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>
|
#include <clutter/clutter-types.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#include <X11/Xlib.h>
|
#include <X11/Xlib.h>
|
||||||
#include <X11/Xatom.h>
|
#include <X11/Xatom.h>
|
||||||
|
Loading…
Reference in New Issue
Block a user