diff options
| author |  Drew DeVault <sir@cmpwn.com> | 2017-07-08 08:20:36 -0400 |
|---|---|---|
| committer |  Drew DeVault <ddevault@vistarmedia.com> | 2017-07-11 20:08:14 -0400 |
| commit | 5882cb68827a8d47c3d98f85b753355b3f36f923 (patch) | |
| tree | 4dc3e3dd0d8baa679b0ef806439e5ffca1cf85ae | |
| parent | Make asciidoc (and man pages) optional (diff) | |
| download | sway-5882cb68827a8d47c3d98f85b753355b3f36f923.tar.gz sway-5882cb68827a8d47c3d98f85b753355b3f36f923.tar.zst sway-5882cb68827a8d47c3d98f85b753355b3f36f923.zip | |
Merge pull request #1265 from johalun/master-freebsd
Adjust _XOPEN_SOURCE value for build on FreeBSD and fix pointer compa…
| -rw-r--r-- | swaybar/event_loop.c | 4 | ||||
| -rw-r--r-- | swaybar/tray/dbus.c | 2 | ||||
| -rw-r--r-- | swaybar/tray/icon.c | 2 | ||||
| -rw-r--r-- | 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 80655d8b..b5861dda 100644 --- a/swaybar/event_loop.c +++ b/swaybar/event_loop.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | #define _XOPEN_SOURCE 500 | 1 | #define _XOPEN_SOURCE 700 |
| 2 | #include <stdlib.h> | 2 | #include <stdlib.h> |
| 3 | #include <stdbool.h> | 3 | #include <stdbool.h> |
| 4 | #include <string.h> | 4 | #include <string.h> |
| @@ -96,7 +96,7 @@ bool remove_event(int fd) { | |||
| 96 | static int timer_item_timer_cmp(const void *_timer_item, const void *_timer) { | 96 | static int timer_item_timer_cmp(const void *_timer_item, const void *_timer) { |
| 97 | const struct timer_item *timer_item = _timer_item; | 97 | const struct timer_item *timer_item = _timer_item; |
| 98 | const timer_t *timer = _timer; | 98 | const timer_t *timer = _timer; |
| 99 | if (timer_item->timer == timer) { | 99 | if (timer_item->timer == *timer) { |
| 100 | return 0; | 100 | return 0; |
| 101 | } else { | 101 | } else { |
| 102 | return -1; | 102 | return -1; |
diff --git a/swaybar/tray/dbus.c b/swaybar/tray/dbus.c index 22531aa6..2a8cefc7 100644 --- a/swaybar/tray/dbus.c +++ b/swaybar/tray/dbus.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | #define _XOPEN_SOURCE 500 | 1 | #define _XOPEN_SOURCE 700 |
| 2 | #include <stdio.h> | 2 | #include <stdio.h> |
| 3 | #include <stdlib.h> | 3 | #include <stdlib.h> |
| 4 | #include <stdint.h> | 4 | #include <stdint.h> |
diff --git a/swaybar/tray/icon.c b/swaybar/tray/icon.c index 1c69ba72..c146bf32 100644 --- a/swaybar/tray/icon.c +++ b/swaybar/tray/icon.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | #define _XOPEN_SOURCE 500 | 1 | #define _XOPEN_SOURCE 700 |
| 2 | #define _POSIX_C_SOURCE 200809L | 2 | #define _POSIX_C_SOURCE 200809L |
| 3 | #include <stdio.h> | 3 | #include <stdio.h> |
| 4 | #include <stdlib.h> | 4 | #include <stdlib.h> |
diff --git a/swaybar/tray/tray.c b/swaybar/tray/tray.c index 00f1a44f..7634942a 100644 --- a/swaybar/tray/tray.c +++ b/swaybar/tray/tray.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | #define _XOPEN_SOURCE 500 | 1 | #define _XOPEN_SOURCE 700 |
| 2 | #include <unistd.h> | 2 | #include <unistd.h> |
| 3 | #include <stdlib.h> | 3 | #include <stdlib.h> |
| 4 | #include <string.h> | 4 | #include <string.h> |