From 5882cb68827a8d47c3d98f85b753355b3f36f923 Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Sat, 8 Jul 2017 08:20:36 -0400 Subject: [PATCH] Merge pull request #1265 from johalun/master-freebsd MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adjust _XOPEN_SOURCE value for build on FreeBSD and fix pointer compa… --- swaybar/event_loop.c | 4 ++-- swaybar/tray/dbus.c | 2 +- swaybar/tray/icon.c | 2 +- swaybar/tray/tray.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/swaybar/event_loop.c b/swaybar/event_loop.c index 80655d8bb..b5861dda7 100644 --- a/swaybar/event_loop.c +++ b/swaybar/event_loop.c @@ -1,4 +1,4 @@ -#define _XOPEN_SOURCE 500 +#define _XOPEN_SOURCE 700 #include #include #include @@ -96,7 +96,7 @@ bool remove_event(int fd) { static int timer_item_timer_cmp(const void *_timer_item, const void *_timer) { const struct timer_item *timer_item = _timer_item; const timer_t *timer = _timer; - if (timer_item->timer == timer) { + if (timer_item->timer == *timer) { return 0; } else { return -1; diff --git a/swaybar/tray/dbus.c b/swaybar/tray/dbus.c index 22531aa65..2a8cefc7e 100644 --- a/swaybar/tray/dbus.c +++ b/swaybar/tray/dbus.c @@ -1,4 +1,4 @@ -#define _XOPEN_SOURCE 500 +#define _XOPEN_SOURCE 700 #include #include #include diff --git a/swaybar/tray/icon.c b/swaybar/tray/icon.c index 1c69ba720..c146bf325 100644 --- a/swaybar/tray/icon.c +++ b/swaybar/tray/icon.c @@ -1,4 +1,4 @@ -#define _XOPEN_SOURCE 500 +#define _XOPEN_SOURCE 700 #define _POSIX_C_SOURCE 200809L #include #include diff --git a/swaybar/tray/tray.c b/swaybar/tray/tray.c index 00f1a44f8..7634942a8 100644 --- a/swaybar/tray/tray.c +++ b/swaybar/tray/tray.c @@ -1,4 +1,4 @@ -#define _XOPEN_SOURCE 500 +#define _XOPEN_SOURCE 700 #include #include #include