diff options
author | Sverker Eriksson <sverker@erlang.org> | 2020-04-17 17:18:25 +0200 |
---|---|---|
committer | Sverker Eriksson <sverker@erlang.org> | 2020-05-03 22:18:48 +0200 |
commit | 7f060311f78e421d78e22f2ff856b0ec1bcfe7f3 (patch) | |
tree | 829f74fc39bd17052025b7cdb8cdceeb433b7a35 /erts | |
parent | a2e77938f4a8bb21f6a1c778130f9a65c2812c78 (diff) | |
download | erlang-7f060311f78e421d78e22f2ff856b0ec1bcfe7f3.tar.gz |
erts: Use ERTS_SYS_FD_INVALID instead of -1
to avoid Windows C compiler warning and make it more correct.
Diffstat (limited to 'erts')
-rw-r--r-- | erts/emulator/sys/common/erl_check_io.c | 4 | ||||
-rw-r--r-- | 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--; } |