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/config/bar.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/config/bar.c')
| -rw-r--r-- | sway/config/bar.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sway/config/bar.c b/sway/config/bar.c index f90fcdc0..1c7c13b2 100644 --- a/sway/config/bar.c +++ b/sway/config/bar.c @@ -194,7 +194,7 @@ static void invoke_swaybar(struct bar_config *bar) { sway_log_errno(SWAY_ERROR, "socketpair failed"); return; } - if (!set_cloexec(sockets[0], true) || !set_cloexec(sockets[1], true)) { + if (!sway_set_cloexec(sockets[0], true) || !sway_set_cloexec(sockets[1], true)) { return; } @@ -222,7 +222,7 @@ static void invoke_swaybar(struct bar_config *bar) { 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); } |