[clutter/clutter-1.10] wayland: Fix some missing includes
- From: Robert Bragg <rbragg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [clutter/clutter-1.10] wayland: Fix some missing includes
- Date: Tue, 20 Mar 2012 15:11:06 +0000 (UTC)
commit e00384826dc5358b17de784922f09f1129b385d9
Author: Neil Roberts <neil linux intel com>
Date: Fri Mar 9 18:24:14 2012 +0000
wayland: Fix some missing includes
The commit 90e5088 added some extra compiler warning options that were
triggering warnings when enabling the wayland build due to missing
header includes. This adds those header includes in.
Reviewed-by: Robert Bragg <robert linux intel com>
Reviewed-by: Emmanuele Bassi <ebassi linux intel com>
clutter/clutter-backend.c | 4 ++++
clutter/evdev/clutter-device-manager-evdev.c | 1 +
clutter/wayland/clutter-event-wayland.c | 1 +
clutter/wayland/clutter-input-device-wayland.c | 1 +
clutter/wayland/clutter-stage-wayland.c | 1 +
5 files changed, 8 insertions(+), 0 deletions(-)
---
diff --git a/clutter/clutter-backend.c b/clutter/clutter-backend.c
index 0bfe4e3..8ce7c0e 100644
--- a/clutter/clutter-backend.c
+++ b/clutter/clutter-backend.c
@@ -55,6 +55,10 @@
#include "clutter-stage-window.h"
#include "clutter-version.h"
+#ifdef HAVE_CLUTTER_WAYLAND_COMPOSITOR
+#include "wayland/clutter-wayland-compositor.h"
+#endif /* HAVE_CLUTTER_WAYLAND_COMPOSITOR */
+
#include <cogl/cogl.h>
#ifdef CLUTTER_INPUT_X11
diff --git a/clutter/evdev/clutter-device-manager-evdev.c b/clutter/evdev/clutter-device-manager-evdev.c
index 8b6f6f4..d3eb8e2 100644
--- a/clutter/evdev/clutter-device-manager-evdev.c
+++ b/clutter/evdev/clutter-device-manager-evdev.c
@@ -47,6 +47,7 @@
#include "clutter-stage-manager.h"
#include "clutter-xkb-utils.h"
#include "clutter-backend-private.h"
+#include "clutter-evdev.h"
#include "clutter-device-manager-evdev.h"
diff --git a/clutter/wayland/clutter-event-wayland.c b/clutter/wayland/clutter-event-wayland.c
index 6067b21..7e5e8f9 100644
--- a/clutter/wayland/clutter-event-wayland.c
+++ b/clutter/wayland/clutter-event-wayland.c
@@ -34,6 +34,7 @@
#include "../clutter-event.h"
#include "../clutter-main.h"
+#include "clutter-event-wayland.h"
typedef struct _ClutterEventSourceWayland
{
diff --git a/clutter/wayland/clutter-input-device-wayland.c b/clutter/wayland/clutter-input-device-wayland.c
index f0d822c..c15d5a7 100644
--- a/clutter/wayland/clutter-input-device-wayland.c
+++ b/clutter/wayland/clutter-input-device-wayland.c
@@ -41,6 +41,7 @@
#include "clutter-input-device-wayland.h"
#include "clutter-backend-wayland.h"
#include "clutter-stage-private.h"
+#include "clutter-wayland.h"
#include "cogl/clutter-stage-cogl.h"
diff --git a/clutter/wayland/clutter-stage-wayland.c b/clutter/wayland/clutter-stage-wayland.c
index 9cd83d6..daa78c4 100644
--- a/clutter/wayland/clutter-stage-wayland.c
+++ b/clutter/wayland/clutter-stage-wayland.c
@@ -36,6 +36,7 @@
#include "clutter-stage-window.h"
#include "clutter-stage-private.h"
#include "clutter-event-private.h"
+#include "clutter-wayland.h"
#include <cogl/cogl.h>
#include <cogl/cogl-wayland-client.h>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]