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 /common | |
| 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 'common')
| -rw-r--r-- | common/util.c | 2 |
1 files changed, 1 insertions, 1 deletions
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) | |||
| 77 | return NULL; | 77 | return NULL; |
| 78 | } | 78 | } |
| 79 | 79 | ||
| 80 | bool set_cloexec(int fd, bool cloexec) { | 80 | bool sway_set_cloexec(int fd, bool cloexec) { |
| 81 | int flags = fcntl(fd, F_GETFD); | 81 | int flags = fcntl(fd, F_GETFD); |
| 82 | if (flags == -1) { | 82 | if (flags == -1) { |
| 83 | sway_log_errno(SWAY_ERROR, "fcntl failed"); | 83 | sway_log_errno(SWAY_ERROR, "fcntl failed"); |