From f80d174e8b179f3af80f7990529c3b0440846dca Mon Sep 17 00:00:00 2001
From: Jan Beich <jbeich@FreeBSD.org>
Date: Mon, 7 Jan 2019 08:07:32 +0000
Subject: Simplify evdev includes on FreeBSD by relying on up-to-date package

As evdev-proto is installed by CI some files have been missed:

 ../examples/pointer-constraints.c:2:10: fatal error: 'linux/input-event-codes.h' file not found
 #include <linux/input-event-codes.h>
         ^~~~~~~~~~~~~~~~~~~~~~~~~~~
 ../examples/relative-pointer-unstable-v1.c:5:10: fatal error: 'linux/input-event-codes.h' file not found
 #include <linux/input-event-codes.h>
          ^~~~~~~~~~~~~~~~~~~~~~~~~~~
---
 backend/session/direct-freebsd.c | 2 +-
 backend/session/direct-ipc.c     | 2 +-
 backend/x11/input_device.c       | 4 ----
 examples/idle-inhibit.c          | 4 ----
 examples/layer-shell.c           | 4 ----
 rootston/cursor.c                | 4 ----
 6 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/backend/session/direct-freebsd.c b/backend/session/direct-freebsd.c
index 342d0d4e..391cc3fd 100644
--- a/backend/session/direct-freebsd.c
+++ b/backend/session/direct-freebsd.c
@@ -1,5 +1,5 @@
 #include <assert.h>
-#include <dev/evdev/input.h>
+#include <linux/input.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <signal.h>
diff --git a/backend/session/direct-ipc.c b/backend/session/direct-ipc.c
index 2b9634da..42ca00e1 100644
--- a/backend/session/direct-ipc.c
+++ b/backend/session/direct-ipc.c
@@ -1,7 +1,7 @@
 #define _POSIX_C_SOURCE 200809L
 #ifdef __FreeBSD__
 #define __BSD_VISIBLE 1
-#include <dev/evdev/input.h>
+#include <linux/input.h>
 #endif
 #include <errno.h>
 #include <fcntl.h>
diff --git a/backend/x11/input_device.c b/backend/x11/input_device.c
index a50f478a..915d9958 100644
--- a/backend/x11/input_device.c
+++ b/backend/x11/input_device.c
@@ -2,11 +2,7 @@
 
 #include <wlr/config.h>
 
-#ifdef __linux__
 #include <linux/input-event-codes.h>
-#elif __FreeBSD__
-#include <dev/evdev/input-event-codes.h>
-#endif
 
 #include <xcb/xcb.h>
 #include <xcb/xfixes.h>
diff --git a/examples/idle-inhibit.c b/examples/idle-inhibit.c
index 48c812e8..348892ab 100644
--- a/examples/idle-inhibit.c
+++ b/examples/idle-inhibit.c
@@ -8,11 +8,7 @@
 #include "idle-inhibit-unstable-v1-client-protocol.h"
 #include "xdg-shell-client-protocol.h"
 
-#ifdef __linux__
 #include <linux/input-event-codes.h>
-#elif __FreeBSD__
-#include <dev/evdev/input-event-codes.h>
-#endif
 
 /**
  * Usage: idle-inhibit
diff --git a/examples/layer-shell.c b/examples/layer-shell.c
index 77b2f6c3..59e2512d 100644
--- a/examples/layer-shell.c
+++ b/examples/layer-shell.c
@@ -1,9 +1,5 @@
 #define _POSIX_C_SOURCE 200112L
-#ifdef __linux__
 #include <linux/input-event-codes.h>
-#elif __FreeBSD__
-#include <dev/evdev/input-event-codes.h>
-#endif
 #include <assert.h>
 #include <GLES2/gl2.h>
 #include <limits.h>
diff --git a/rootston/cursor.c b/rootston/cursor.c
index d2d3b510..b7ecc813 100644
--- a/rootston/cursor.c
+++ b/rootston/cursor.c
@@ -7,11 +7,7 @@
 #include <wlr/util/edges.h>
 #include <wlr/util/log.h>
 #include <wlr/util/region.h>
-#ifdef __linux__
 #include <linux/input-event-codes.h>
-#elif __FreeBSD__
-#include <dev/evdev/input-event-codes.h>
-#endif
 #include "rootston/cursor.h"
 #include "rootston/desktop.h"
 #include "rootston/view.h"
-- 
cgit v1.2.3