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

2 files changed, 4 insertions, 4 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);
                         }
 
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) {
                 sway_log_errno(SWAY_ERROR, "socketpair failed");
                 return false;
         }
-        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 false;
         }
 
@@ -529,7 +529,7 @@ static bool _spawn_swaybg(char **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);
                         }