diff options
author | Sheena Artrip <sheena.artrip@gmail.com> | 2019-10-28 22:54:16 -0700 |
---|---|---|
committer | Drew DeVault <sir@cmpwn.com> | 2019-11-01 12:41:08 -0400 |
commit | 7efb5d467368ea9168cebc2473bc3c6942e031bb (patch) | |
tree | 2d707d7d6c85453fdc187ecd5e8c8cda34493300 /sway/config/output.c | |
parent | focus: add a NULL check in `focus <direction>` (diff) | |
download | sway-7efb5d467368ea9168cebc2473bc3c6942e031bb.tar.gz sway-7efb5d467368ea9168cebc2473bc3c6942e031bb.tar.zst sway-7efb5d467368ea9168cebc2473bc3c6942e031bb.zip |
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/output.c')
-rw-r--r-- | sway/config/output.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sway/config/output.c b/sway/config/output.c index 50bf1155..42deec67 100644 --- a/sway/config/output.c +++ b/sway/config/output.c | |||
@@ -505,7 +505,7 @@ static bool _spawn_swaybg(char **command) { | |||
505 | sway_log_errno(SWAY_ERROR, "socketpair failed"); | 505 | sway_log_errno(SWAY_ERROR, "socketpair failed"); |
506 | return false; | 506 | return false; |
507 | } | 507 | } |
508 | if (!set_cloexec(sockets[0], true) || !set_cloexec(sockets[1], true)) { | 508 | if (!sway_set_cloexec(sockets[0], true) || !sway_set_cloexec(sockets[1], true)) { |
509 | return false; | 509 | return false; |
510 | } | 510 | } |
511 | 511 | ||
@@ -529,7 +529,7 @@ static bool _spawn_swaybg(char **command) { | |||
529 | sway_log_errno(SWAY_ERROR, "fork failed"); | 529 | sway_log_errno(SWAY_ERROR, "fork failed"); |
530 | _exit(EXIT_FAILURE); | 530 | _exit(EXIT_FAILURE); |
531 | } else if (pid == 0) { | 531 | } else if (pid == 0) { |
532 | if (!set_cloexec(sockets[1], false)) { | 532 | if (!sway_set_cloexec(sockets[1], false)) { |
533 | _exit(EXIT_FAILURE); | 533 | _exit(EXIT_FAILURE); |
534 | } | 534 | } |
535 | 535 | ||