summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Jan Beich <jbeich@FreeBSD.org>2019-01-09 10:50:58 +0000
committerLibravatar Jan Beich <jbeich@FreeBSD.org>2019-01-09 11:02:05 +0000
commit0a4c4f3e52762a953e20419f1fef1f2f62c9873b (patch)
tree079ec47dfb3312385d3c65033056631031665d54
parentMerge pull request #3386 from RedSoxFan/seat-reload-wait (diff)
downloadsway-0a4c4f3e52762a953e20419f1fef1f2f62c9873b.tar.gz
sway-0a4c4f3e52762a953e20419f1fef1f2f62c9873b.tar.zst
sway-0a4c4f3e52762a953e20419f1fef1f2f62c9873b.zip
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> ^~~~~~~~~~~~~~~~~~~~~~~~~~~
-rw-r--r--sway/commands/bind.c4
-rw-r--r--sway/commands/seat/cursor.c4
-rw-r--r--sway/config.c4
-rw-r--r--sway/input/cursor.c4
-rw-r--r--sway/input/seat.c4
-rw-r--r--sway/ipc-server.c4
-rw-r--r--swaybar/input.c4
7 files changed, 0 insertions, 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 @@
1#define _POSIX_C_SOURCE 200809L 1#define _POSIX_C_SOURCE 200809L
2#include <libevdev/libevdev.h> 2#include <libevdev/libevdev.h>
3#ifdef __linux__
4#include <linux/input-event-codes.h> 3#include <linux/input-event-codes.h>
5#elif __FreeBSD__
6#include <dev/evdev/input-event-codes.h>
7#endif
8#include <xkbcommon/xkbcommon.h> 4#include <xkbcommon/xkbcommon.h>
9#include <xkbcommon/xkbcommon-names.h> 5#include <xkbcommon/xkbcommon-names.h>
10#include <string.h> 6#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 @@
1#define _POSIX_C_SOURCE 200809L 1#define _POSIX_C_SOURCE 200809L
2#ifdef __linux__
3#include <linux/input-event-codes.h> 2#include <linux/input-event-codes.h>
4#elif __FreeBSD__
5#include <dev/evdev/input-event-codes.h>
6#endif
7 3
8#include <strings.h> 4#include <strings.h>
9#include <wlr/types/wlr_cursor.h> 5#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 @@
13#include <limits.h> 13#include <limits.h>
14#include <dirent.h> 14#include <dirent.h>
15#include <strings.h> 15#include <strings.h>
16#ifdef __linux__
17#include <linux/input-event-codes.h> 16#include <linux/input-event-codes.h>
18#elif __FreeBSD__
19#include <dev/evdev/input-event-codes.h>
20#endif
21#include <wlr/types/wlr_output.h> 17#include <wlr/types/wlr_output.h>
22#include "sway/input/input-manager.h" 18#include "sway/input/input-manager.h"
23#include "sway/input/seat.h" 19#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 @@
1#define _POSIX_C_SOURCE 200809L 1#define _POSIX_C_SOURCE 200809L
2#include <math.h> 2#include <math.h>
3#include <libevdev/libevdev.h> 3#include <libevdev/libevdev.h>
4#ifdef __linux__
5#include <linux/input-event-codes.h> 4#include <linux/input-event-codes.h>
6#elif __FreeBSD__
7#include <dev/evdev/input-event-codes.h>
8#endif
9#include <float.h> 5#include <float.h>
10#include <limits.h> 6#include <limits.h>
11#include <wlr/types/wlr_cursor.h> 7#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 @@
1#define _POSIX_C_SOURCE 200809L 1#define _POSIX_C_SOURCE 200809L
2#include <assert.h> 2#include <assert.h>
3#include <errno.h> 3#include <errno.h>
4#ifdef __linux__
5#include <linux/input-event-codes.h> 4#include <linux/input-event-codes.h>
6#elif __FreeBSD__
7#include <dev/evdev/input-event-codes.h>
8#endif
9#include <strings.h> 5#include <strings.h>
10#include <time.h> 6#include <time.h>
11#include <wlr/types/wlr_cursor.h> 7#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 @@
1// See https://i3wm.org/docs/ipc.html for protocol information 1// See https://i3wm.org/docs/ipc.html for protocol information
2#define _POSIX_C_SOURCE 200112L 2#define _POSIX_C_SOURCE 200112L
3#ifdef __linux__
4#include <linux/input-event-codes.h> 3#include <linux/input-event-codes.h>
5#elif __FreeBSD__
6#include <dev/evdev/input-event-codes.h>
7#endif
8#include <assert.h> 4#include <assert.h>
9#include <errno.h> 5#include <errno.h>
10#include <fcntl.h> 6#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 @@
1#include <assert.h> 1#include <assert.h>
2#ifdef __FreeBSD__
3#include <dev/evdev/input-event-codes.h>
4#else
5#include <linux/input-event-codes.h> 2#include <linux/input-event-codes.h>
6#endif
7#include <stdlib.h> 3#include <stdlib.h>
8#include <wayland-client.h> 4#include <wayland-client.h>
9#include <wayland-cursor.h> 5#include <wayland-cursor.h>