From 7efb5d467368ea9168cebc2473bc3c6942e031bb Mon Sep 17 00:00:00 2001 From: Sheena Artrip Date: Mon, 28 Oct 2019 22:54:16 -0700 Subject: 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 --- common/util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'common') diff --git a/common/util.c b/common/util.c index 3a807edb..c0324b2f 100644 --- a/common/util.c +++ b/common/util.c @@ -77,7 +77,7 @@ const char *sway_wl_output_subpixel_to_string(enum wl_output_subpixel subpixel) return NULL; } -bool set_cloexec(int fd, bool cloexec) { +bool sway_set_cloexec(int fd, bool cloexec) { int flags = fcntl(fd, F_GETFD); if (flags == -1) { sway_log_errno(SWAY_ERROR, "fcntl failed"); -- cgit v1.2.3