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 <dan...@fooishbar.org>
---
This is actually against 1.2 branch, but should apply fine to master.
Please apply to unbreak the X11 backend.
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 f655086..221546b 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>
#include <wayland-server.h>
diff --git a/src/data-device.c b/src/data-device.c
index c89379c..81e7602 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 84834b6..4173404 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"
--
1.8.3.1
_______________________________________________
wayland-devel mailing list
wayland-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/wayland-devel
