diff options
| author | Sheena Artrip <[email protected]> | 2019-10-28 22:54:16 -0700 |
|---|---|---|
| committer | Drew DeVault <[email protected]> | 2019-11-01 12:41:08 -0400 |
| commit | 7efb5d467368ea9168cebc2473bc3c6942e031bb (patch) | |
| tree | 2d707d7d6c85453fdc187ecd5e8c8cda34493300 /sway/swaynag.c | |
| parent | cf95de9cae0561a58d6435802411dcee63ef2f5f (diff) | |
Rename symbol set_cloexec to sway_set_cloexec, remove duplicates.
set_cloexec is defined by both sway and wlroots (and who-knows-else),
so rename the sway one for supporting static linkage. We also remove
the duplicate version of this in client/.
Fixes: https://github.com/swaywm/sway/issues/4677
Diffstat (limited to 'sway/swaynag.c')
| -rw-r--r-- | sway/swaynag.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sway/swaynag.c b/sway/swaynag.c index 0fca6c71..db5a919a 100644 --- a/sway/swaynag.c +++ b/sway/swaynag.c @@ -36,7 +36,7 @@ bool swaynag_spawn(const char *swaynag_command, sway_log(SWAY_ERROR, "Failed to create pipe for swaynag"); return false; } - if (!set_cloexec(swaynag->fd[1], true)) { + if (!sway_set_cloexec(swaynag->fd[1], true)) { goto failed; } } @@ -46,7 +46,7 @@ bool swaynag_spawn(const char *swaynag_command, sway_log_errno(SWAY_ERROR, "socketpair failed"); goto failed; } - if (!set_cloexec(sockets[0], true) || !set_cloexec(sockets[1], true)) { + if (!sway_set_cloexec(sockets[0], true) || !sway_set_cloexec(sockets[1], true)) { goto failed; } @@ -69,7 +69,7 @@ bool swaynag_spawn(const char *swaynag_command, sway_log_errno(SWAY_ERROR, "fork failed"); _exit(EXIT_FAILURE); } else if (pid == 0) { - if (!set_cloexec(sockets[1], false)) { + if (!sway_set_cloexec(sockets[1], false)) { _exit(EXIT_FAILURE); } |