From 0a4c4f3e52762a953e20419f1fef1f2f62c9873b Mon Sep 17 00:00:00 2001
From: Jan Beich <jbeich@FreeBSD.org>
Date: Wed, 9 Jan 2019 10:50:58 +0000
Subject: Simplify evdev includes on FreeBSD by relying on up-to-date package

evdev-proto is installed by a dependency, so some files have been missed:

  In file included from ../sway/input/cursor.c:3:
  /usr/local/include/libevdev-1.0/libevdev/libevdev.h:30:10: fatal error: 'linux/input.h' file not found
  #include <linux/input.h>
	   ^~~~~~~~~~~~~~~
  ../swaybar/i3bar.c:3:10: fatal error: 'linux/input-event-codes.h' file not found
  #include <linux/input-event-codes.h>
	   ^~~~~~~~~~~~~~~~~~~~~~~~~~~
---
 sway/commands/bind.c        | 4 ----
 sway/commands/seat/cursor.c | 4 ----
 sway/config.c               | 4 ----
 sway/input/cursor.c         | 4 ----
 sway/input/seat.c           | 4 ----
 sway/ipc-server.c           | 4 ----
 swaybar/input.c             | 4 ----
 7 files changed, 28 deletions(-)

diff --git a/sway/commands/bind.c b/sway/commands/bind.c
index 7994ab2f..4fceaf8c 100644
--- a/sway/commands/bind.c
+++ b/sway/commands/bind.c
@@ -1,10 +1,6 @@
 #define _POSIX_C_SOURCE 200809L
 #include <libevdev/libevdev.h>
-#ifdef __linux__
 #include <linux/input-event-codes.h>
-#elif __FreeBSD__
-#include <dev/evdev/input-event-codes.h>
-#endif
 #include <xkbcommon/xkbcommon.h>
 #include <xkbcommon/xkbcommon-names.h>
 #include <string.h>
diff --git a/sway/commands/seat/cursor.c b/sway/commands/seat/cursor.c
index b4728543..1fbc68a1 100644
--- a/sway/commands/seat/cursor.c
+++ b/sway/commands/seat/cursor.c
@@ -1,9 +1,5 @@
 #define _POSIX_C_SOURCE 200809L
-#ifdef __linux__
 #include <linux/input-event-codes.h>
-#elif __FreeBSD__
-#include <dev/evdev/input-event-codes.h>
-#endif
 
 #include <strings.h>
 #include <wlr/types/wlr_cursor.h>
diff --git a/sway/config.c b/sway/config.c
index dfbe4cb9..f99f043c 100644
--- a/sway/config.c
+++ b/sway/config.c
@@ -13,11 +13,7 @@
 #include <limits.h>
 #include <dirent.h>
 #include <strings.h>
-#ifdef __linux__
 #include <linux/input-event-codes.h>
-#elif __FreeBSD__
-#include <dev/evdev/input-event-codes.h>
-#endif
 #include <wlr/types/wlr_output.h>
 #include "sway/input/input-manager.h"
 #include "sway/input/seat.h"
diff --git a/sway/input/cursor.c b/sway/input/cursor.c
index 510030ae..96feb47d 100644
--- a/sway/input/cursor.c
+++ b/sway/input/cursor.c
@@ -1,11 +1,7 @@
 #define _POSIX_C_SOURCE 200809L
 #include <math.h>
 #include <libevdev/libevdev.h>
-#ifdef __linux__
 #include <linux/input-event-codes.h>
-#elif __FreeBSD__
-#include <dev/evdev/input-event-codes.h>
-#endif
 #include <float.h>
 #include <limits.h>
 #include <wlr/types/wlr_cursor.h>
diff --git a/sway/input/seat.c b/sway/input/seat.c
index 41a3a4df..a8df5b99 100644
--- a/sway/input/seat.c
+++ b/sway/input/seat.c
@@ -1,11 +1,7 @@
 #define _POSIX_C_SOURCE 200809L
 #include <assert.h>
 #include <errno.h>
-#ifdef __linux__
 #include <linux/input-event-codes.h>
-#elif __FreeBSD__
-#include <dev/evdev/input-event-codes.h>
-#endif
 #include <strings.h>
 #include <time.h>
 #include <wlr/types/wlr_cursor.h>
diff --git a/sway/ipc-server.c b/sway/ipc-server.c
index 28546d41..456db866 100644
--- a/sway/ipc-server.c
+++ b/sway/ipc-server.c
@@ -1,10 +1,6 @@
 // See https://i3wm.org/docs/ipc.html for protocol information
 #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 <errno.h>
 #include <fcntl.h>
diff --git a/swaybar/input.c b/swaybar/input.c
index 7d219be3..620da977 100644
--- a/swaybar/input.c
+++ b/swaybar/input.c
@@ -1,9 +1,5 @@
 #include <assert.h>
-#ifdef __FreeBSD__
-#include <dev/evdev/input-event-codes.h>
-#else
 #include <linux/input-event-codes.h>
-#endif
 #include <stdlib.h>
 #include <wayland-client.h>
 #include <wayland-cursor.h>
-- 
cgit v1.2.3