From 8e7a8bdeea37640abe0013425934f86a63e36cf8 Mon Sep 17 00:00:00 2001
From: Daniel Stone <daniel@fooishbar.org>
Date: Thu, 15 Aug 2013 01:10:24 +0100
Subject: [PATCH] Add more missing config.h includes

config.h includes were missing in a few files, including input.c, the
lack of which caused the X11 backend to segfault instantly due to not
having an xkbcommon context.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
---
 src/cms-helper.h      | 2 ++
 src/compositor.h      | 2 ++
 src/data-device.c     | 2 ++
 src/evdev.h           | 2 ++
 src/filter.h          | 2 ++
 src/input.c           | 2 ++
 src/launcher-util.h   | 2 ++
 src/pixman-renderer.h | 4 +++-
 src/spring-tool.c     | 2 ++
 src/udev-seat.h       | 2 ++
 10 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/cms-helper.h b/src/cms-helper.h
index a919a42..6e5594d 100644
--- a/src/cms-helper.h
+++ b/src/cms-helper.h
@@ -23,6 +23,8 @@
 #ifndef _WESTON_CMS_H_
 #define _WESTON_CMS_H_
 
+#include "config.h"
+
 #include "compositor.h"
 
 /* General overview on how to be a CMS plugin:
diff --git a/src/compositor.h b/src/compositor.h
index 6db3c61..ee7853b 100644
--- a/src/compositor.h
+++ b/src/compositor.h
@@ -28,6 +28,8 @@
 extern "C" {
 #endif
 
+#include "config.h"
+
 #include <pixman.h>
 #include <xkbcommon/xkbcommon.h>
 
diff --git a/src/data-device.c b/src/data-device.c
index 4bf6256..25587b2 100644
--- a/src/data-device.c
+++ b/src/data-device.c
@@ -20,6 +20,8 @@
  * OF THIS SOFTWARE.
  */
 
+#include "config.h"
+
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
diff --git a/src/evdev.h b/src/evdev.h
index eb5c868..524fa22 100644
--- a/src/evdev.h
+++ b/src/evdev.h
@@ -23,6 +23,8 @@
 #ifndef EVDEV_H
 #define EVDEV_H
 
+#include "config.h"
+
 #include <linux/input.h>
 #include <wayland-util.h>
 
diff --git a/src/filter.h b/src/filter.h
index ff8e579..850ce8d 100644
--- a/src/filter.h
+++ b/src/filter.h
@@ -23,6 +23,8 @@
 #ifndef _FILTER_H_
 #define _FILTER_H_
 
+#include "config.h"
+
 #include <wayland-util.h>
 
 #include "compositor.h"
diff --git a/src/input.c b/src/input.c
index 68cbbc8..ad21be1 100644
--- a/src/input.c
+++ b/src/input.c
@@ -20,6 +20,8 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include "config.h"
+
 #include <stdlib.h>
 #include <stdint.h>
 #include <string.h>
diff --git a/src/launcher-util.h b/src/launcher-util.h
index da11028..c79b47c 100644
--- a/src/launcher-util.h
+++ b/src/launcher-util.h
@@ -23,6 +23,8 @@
 #ifndef _WESTON_LAUNCHER_UTIL_H_
 #define _WESTON_LAUNCHER_UTIL_H_
 
+#include "config.h"
+
 #include "compositor.h"
 
 int
diff --git a/src/pixman-renderer.h b/src/pixman-renderer.h
index 77761ba..2532299 100644
--- a/src/pixman-renderer.h
+++ b/src/pixman-renderer.h
@@ -20,7 +20,9 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include  "compositor.h"
+#include "config.h"
+
+#include "compositor.h"
 
 int
 pixman_renderer_init(struct weston_compositor *ec);
diff --git a/src/spring-tool.c b/src/spring-tool.c
index ba01477..935acc4 100644
--- a/src/spring-tool.c
+++ b/src/spring-tool.c
@@ -20,6 +20,8 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include "config.h"
+
 #include "compositor.h"
 
 WL_EXPORT void
diff --git a/src/udev-seat.h b/src/udev-seat.h
index 3543e7c..5bf7caa 100644
--- a/src/udev-seat.h
+++ b/src/udev-seat.h
@@ -23,6 +23,8 @@
 #ifndef _UDEV_SEAT_H_
 #define _UDEV_SEAT_H_
 
+#include "config.h"
+
 #include <libudev.h>
 
 #include "compositor.h"
-- 
2.7.4