diff options
| author | Drew DeVault <sir@cmpwn.com> | 2018-09-26 16:37:23 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-26 16:37:23 -0500 |
| commit | d00a581ae01beef7159e87cb1cf2ecd5c2c19ca3 (patch) | |
| tree | ee7b21a8980b30a8524e44c43e0cce6319ba9b4a | |
| parent | a8a0014e0f25eefdf6712387c34e8d55614205ce (diff) | |
| parent | 2f258eff6fd2c89a94caa658c1ea22beb76d728a (diff) | |
| download | sway-d00a581ae01beef7159e87cb1cf2ecd5c2c19ca3.tar.xz | |
Merge pull request #2715 from sghctoma/add-c11_source
Use _C11_SOURCE feature test macro on FreeBSD (fixes #2616)
| -rw-r--r-- | meson.build | 4 | ||||
| -rw-r--r-- | sway/ipc-server.c | 13 |
2 files changed, 12 insertions, 5 deletions
diff --git a/meson.build b/meson.build index 82e4a96f..76eaff20 100644 --- a/meson.build +++ b/meson.build @@ -22,6 +22,10 @@ datadir = get_option('datadir') sysconfdir = get_option('sysconfdir') prefix = get_option('prefix') +if is_freebsd + add_project_arguments('-D_C11_SOURCE', language: 'c') +endif + swayidle_deps = [] jsonc = dependency('json-c', version: '>=0.13') diff --git a/sway/ipc-server.c b/sway/ipc-server.c index 99959c97..2d915502 100644 --- a/sway/ipc-server.c +++ b/sway/ipc-server.c @@ -1,8 +1,5 @@ // See https://i3wm.org/docs/ipc.html for protocol information -#ifndef __FreeBSD__ -// Any value will hide SOCK_CLOEXEC on FreeBSD (__BSD_VISIBLE=0) -#define _XOPEN_SOURCE 700 -#endif +#define _POSIX_C_SOURCE 200112L #ifdef __linux__ #include <linux/input-event-codes.h> #elif __FreeBSD__ @@ -89,10 +86,16 @@ static void handle_display_destroy(struct wl_listener *listener, void *data) { } void ipc_init(struct sway_server *server) { - ipc_socket = socket(AF_UNIX, SOCK_STREAM | SOCK_NONBLOCK | SOCK_CLOEXEC, 0); + ipc_socket = socket(AF_UNIX, SOCK_STREAM, 0); if (ipc_socket == -1) { sway_abort("Unable to create IPC socket"); } + if (fcntl(ipc_socket, F_SETFD, FD_CLOEXEC) == -1) { + sway_abort("Unable to set CLOEXEC on IPC socket"); + } + if (fcntl(ipc_socket, F_SETFL, O_NONBLOCK) == -1) { + sway_abort("Unable to set NONBLOCK on IPC socket"); + } ipc_sockaddr = ipc_user_sockaddr(); |