diff options
| author |  Drew DeVault <sir@cmpwn.com> | 2017-10-14 16:32:50 -0400 |
|---|---|---|
| committer | Drew DeVault <sir@cmpwn.com> | 2017-10-16 21:03:50 -0400 |
| commit | d3c2b5f95146d926577e069d6c5d8869e5b66dfe (patch) | |
| tree | da106e30210958dcdd7c0f8e75fa09d135f2452f | |
| parent | Merge pull request #1400 from madblobfish/manpages (diff) | |
| download | sway-d3c2b5f95146d926577e069d6c5d8869e5b66dfe.tar.gz sway-d3c2b5f95146d926577e069d6c5d8869e5b66dfe.tar.zst sway-d3c2b5f95146d926577e069d6c5d8869e5b66dfe.zip | |
Merge pull request #1398 from johalun/freebsd-fix
Fix build on FreeBSD adjusting/removing _XOPEN_SOURCE declaration.
| -rw-r--r-- | sway/ipc-server.c | 4 | ||||
| -rw-r--r-- | swaybar/status_line.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/sway/ipc-server.c b/sway/ipc-server.c index 4ce2b7eb..b560b930 100644 --- a/sway/ipc-server.c +++ b/sway/ipc-server.c | |||
| @@ -1,6 +1,10 @@ | |||
| 1 | // See https://i3wm.org/docs/ipc.html for protocol information | 1 | // See https://i3wm.org/docs/ipc.html for protocol information |
| 2 | 2 | ||
| 3 | #ifndef __FreeBSD__ | ||
| 4 | // Any value will hide SOCK_CLOEXEC on FreeBSD (__BSD_VISIBLE=0) | ||
| 3 | #define _XOPEN_SOURCE 700 | 5 | #define _XOPEN_SOURCE 700 |
| 6 | #endif | ||
| 7 | |||
| 4 | #include <errno.h> | 8 | #include <errno.h> |
| 5 | #include <string.h> | 9 | #include <string.h> |
| 6 | #include <sys/socket.h> | 10 | #include <sys/socket.h> |
diff --git a/swaybar/status_line.c b/swaybar/status_line.c index e0564c26..cc324fdb 100644 --- a/swaybar/status_line.c +++ b/swaybar/status_line.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 <string.h> | 3 | #include <string.h> |
| 4 | #include <unistd.h> | 4 | #include <unistd.h> |