From 6e28121ff3944ccded33a7a9900e1bb04f4a4516 Mon Sep 17 00:00:00 2001
From: Robert Bragg <robert@linux.intel.com>
Date: Tue, 1 Nov 2011 15:47:43 +0000
Subject: [PATCH] cogl: include <cogl/cogl-xlib.h> for xlib specific symbols

Since Xlib.h is such a terrible citizen when it comes to symbol
namespacing it's not desirable to include Xlib.h if it is not absolutely
required. Cogl now has a standalone cogl-xlib.h that should be included
whenever any xlib specific symbols are required.

This patch updates clutter to include <cogl/cogl-xlib.h> wherever
clutter needs to use xlib specific cogl apis.

Acked-by: Emmanuele Bassi <ebassi@linux.intel.com>
---
 clutter/cogl/clutter-backend-cogl.c | 2 ++
 clutter/x11/clutter-backend-x11.c   | 1 +
 2 files changed, 3 insertions(+)

diff --git a/clutter/cogl/clutter-backend-cogl.c b/clutter/cogl/clutter-backend-cogl.c
index b6881c8bd..f54776e34 100644
--- a/clutter/cogl/clutter-backend-cogl.c
+++ b/clutter/cogl/clutter-backend-cogl.c
@@ -55,6 +55,8 @@
 #include "clutter-cex100.h"
 #endif
 
+#include <cogl/cogl-xlib.h>
+
 static ClutterBackendCogl *backend_singleton = NULL;
 
 static gchar *clutter_vblank = NULL;
diff --git a/clutter/x11/clutter-backend-x11.c b/clutter/x11/clutter-backend-x11.c
index ab1cde264..bacf96700 100644
--- a/clutter/x11/clutter-backend-x11.c
+++ b/clutter/x11/clutter-backend-x11.c
@@ -59,6 +59,7 @@
 #endif
 
 #include <cogl/cogl.h>
+#include <cogl/cogl-xlib.h>
 
 #include "clutter-backend.h"
 #include "clutter-debug.h"