diff options
| author | emersion <contact@emersion.fr> | 2019-01-09 14:00:54 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-09 14:00:54 +0100 |
| commit | f9cea7f09bb0307ab47505e6f7d7cb1f02f45783 (patch) | |
| tree | 079ec47dfb3312385d3c65033056631031665d54 | |
| parent | d06782c5e71fb1a6229c1add16bae0dbf919c5c1 (diff) | |
| parent | 0a4c4f3e52762a953e20419f1fef1f2f62c9873b (diff) | |
| download | sway-f9cea7f09bb0307ab47505e6f7d7cb1f02f45783.tar.xz | |
Merge pull request #3391 from jbeich/freebsd
Simplify FreeBSD build
| -rw-r--r-- | sway/commands/bind.c | 4 | ||||
| -rw-r--r-- | sway/commands/seat/cursor.c | 4 | ||||
| -rw-r--r-- | sway/config.c | 4 | ||||
| -rw-r--r-- | sway/input/cursor.c | 4 | ||||
| -rw-r--r-- | sway/input/seat.c | 4 | ||||
| -rw-r--r-- | sway/ipc-server.c | 4 | ||||
| -rw-r--r-- | swaybar/input.c | 4 |
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 @@ #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> |