alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Simplify evdev includes on FreeBSD by relying on up-to-date package

Browse source 
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>
	   ^~~~~~~~~~~~~~~~~~~~~~~~~~~
This commit is contained in:
Jan Beich 2019-01-09 10:50:58 +00:00
parent d06782c5e7
commit 0a4c4f3e52
7 changed files with 0 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sway/commands/bind.c
View file

@ -1,10 +1,6 @@
#define _POSIX_C_SOURCE 200809L #define _POSIX_C_SOURCE 200809L
#include <libevdev/libevdev.h> #include <libevdev/libevdev.h>
#ifdef __linux__
#include <linux/input-event-codes.h> #include <linux/input-event-codes.h>
#elif __FreeBSD__
#include <dev/evdev/input-event-codes.h>
#endif
#include <xkbcommon/xkbcommon.h> #include <xkbcommon/xkbcommon.h>
#include <xkbcommon/xkbcommon-names.h> #include <xkbcommon/xkbcommon-names.h>
#include <string.h> #include <string.h>

4
sway/commands/seat/cursor.c
View file

@ -1,9 +1,5 @@
#define _POSIX_C_SOURCE 200809L #define _POSIX_C_SOURCE 200809L
#ifdef __linux__
#include <linux/input-event-codes.h> #include <linux/input-event-codes.h>
#elif __FreeBSD__
#include <dev/evdev/input-event-codes.h>
#endif
#include <strings.h> #include <strings.h>
#include <wlr/types/wlr_cursor.h> #include <wlr/types/wlr_cursor.h>

4
sway/config.c
View file

@ -13,11 +13,7 @@
#include <limits.h> #include <limits.h>
#include <dirent.h> #include <dirent.h>
#include <strings.h> #include <strings.h>
#ifdef __linux__
#include <linux/input-event-codes.h> #include <linux/input-event-codes.h>
#elif __FreeBSD__
#include <dev/evdev/input-event-codes.h>
#endif
#include <wlr/types/wlr_output.h> #include <wlr/types/wlr_output.h>
#include "sway/input/input-manager.h" #include "sway/input/input-manager.h"
#include "sway/input/seat.h" #include "sway/input/seat.h"

4
sway/input/cursor.c
View file

@ -1,11 +1,7 @@
#define _POSIX_C_SOURCE 200809L #define _POSIX_C_SOURCE 200809L
#include <math.h> #include <math.h>
#include <libevdev/libevdev.h> #include <libevdev/libevdev.h>
#ifdef __linux__
#include <linux/input-event-codes.h> #include <linux/input-event-codes.h>
#elif __FreeBSD__
#include <dev/evdev/input-event-codes.h>
#endif
#include <float.h> #include <float.h>
#include <limits.h> #include <limits.h>
#include <wlr/types/wlr_cursor.h> #include <wlr/types/wlr_cursor.h>

4
sway/input/seat.c
View file

@ -1,11 +1,7 @@
#define _POSIX_C_SOURCE 200809L #define _POSIX_C_SOURCE 200809L
#include <assert.h> #include <assert.h>
#include <errno.h> #include <errno.h>
#ifdef __linux__
#include <linux/input-event-codes.h> #include <linux/input-event-codes.h>
#elif __FreeBSD__
#include <dev/evdev/input-event-codes.h>
#endif
#include <strings.h> #include <strings.h>
#include <time.h> #include <time.h>
#include <wlr/types/wlr_cursor.h> #include <wlr/types/wlr_cursor.h>

4
sway/ipc-server.c
View file

@ -1,10 +1,6 @@
// See https://i3wm.org/docs/ipc.html for protocol information // See https://i3wm.org/docs/ipc.html for protocol information
#define _POSIX_C_SOURCE 200112L #define _POSIX_C_SOURCE 200112L
#ifdef __linux__
#include <linux/input-event-codes.h> #include <linux/input-event-codes.h>
#elif __FreeBSD__
#include <dev/evdev/input-event-codes.h>
#endif
#include <assert.h> #include <assert.h>
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>

4
swaybar/input.c
View file

@ -1,9 +1,5 @@
#include <assert.h> #include <assert.h>
#ifdef __FreeBSD__
#include <dev/evdev/input-event-codes.h>
#else
#include <linux/input-event-codes.h> #include <linux/input-event-codes.h>
#endif
#include <stdlib.h> #include <stdlib.h>
#include <wayland-client.h> #include <wayland-client.h>
#include <wayland-cursor.h> #include <wayland-cursor.h>