File 0843-erts-Use-ERTS_SYS_FD_INVALID-instead-of-1.patch of Package erlang
From 7f060311f78e421d78e22f2ff856b0ec1bcfe7f3 Mon Sep 17 00:00:00 2001
From: Sverker Eriksson <sverker@erlang.org>
Date: Fri, 17 Apr 2020 17:18:25 +0200
Subject: [PATCH 2/7] erts: Use ERTS_SYS_FD_INVALID instead of -1
to avoid Windows C compiler warning and make it more correct.
---
erts/emulator/sys/common/erl_check_io.c | 4 ++--
erts/emulator/sys/common/erl_poll.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/erts/emulator/sys/common/erl_check_io.c b/erts/emulator/sys/common/erl_check_io.c
index d02c2686a4..7147031deb 100644
--- a/erts/emulator/sys/common/erl_check_io.c
+++ b/erts/emulator/sys/common/erl_check_io.c
@@ -1718,10 +1718,10 @@ erts_check_io(ErtsPollThread *psi, ErtsMonotonicTime timeout_time)
ErtsDrvEventState *state;
ErtsPollEvents revents = ERTS_POLL_RES_GET_EVTS(&psi->pollres[i]);
- /* The fd will be set to -1 if a pollset internal fd was triggered
+ /* The fd will be set to INVALID if a pollset internal fd was triggered
that was determined to be too expensive to remove from the result.
*/
- if (fd == -1) continue;
+ if (fd == ERTS_SYS_FD_INVALID) continue;
erts_mtx_lock(fd_mtx(fd));
diff --git a/erts/emulator/sys/common/erl_poll.c b/erts/emulator/sys/common/erl_poll.c
index e669572499..6eb5a99b06 100644
--- a/erts/emulator/sys/common/erl_poll.c
+++ b/erts/emulator/sys/common/erl_poll.c
@@ -1459,13 +1459,13 @@ ERTS_POLL_EXPORT(save_result)(ErtsPollSet *ps, ErtsPollResFd pr[], int max_res,
if (ERTS_POLL_USE_WAKEUP(ps) && fd == wake_fd) {
cleanup_wakeup_pipe(ps);
- ERTS_POLL_RES_SET_FD(&pr[i], -1);
+ ERTS_POLL_RES_SET_FD(&pr[i], ERTS_SYS_FD_INVALID);
ERTS_POLL_RES_SET_EVTS(&pr[i], ERTS_POLL_EV_NONE);
res--;
}
#if ERTS_POLL_USE_TIMERFD
else if (fd == ps->timer_fd) {
- ERTS_POLL_RES_SET_FD(&pr[i], -1);
+ ERTS_POLL_RES_SET_FD(&pr[i], ERTS_SYS_FD_INVALID);
ERTS_POLL_RES_SET_EVTS(&pr[i], ERTS_POLL_EV_NONE);
res--;
}
--
2.26.1