aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2019-02-18 19:44:12 +0100
committerLukas Larsson <[email protected]>2019-02-18 19:44:12 +0100
commit6941cb793e9bb7b58307753411b6126e80ffd720 (patch)
treec2521dd886b78fe3f9c6043f2e051ed09c625569
parent5caddff6454167783460a6533c3145a510349cc5 (diff)
parentad87370344bb1b834ff930fac80eb5ff3d1130dd (diff)
downloadotp-6941cb793e9bb7b58307753411b6126e80ffd720.tar.gz
otp-6941cb793e9bb7b58307753411b6126e80ffd720.tar.bz2
otp-6941cb793e9bb7b58307753411b6126e80ffd720.zip
Merge branch 'lukas/erts/fix-exit_status-netbsd/OTP-15558' into maint
* lukas/erts/fix-exit_status-netbsd/OTP-15558: Fix EV_DISPATCH detection on NetBSD
-rw-r--r--erts/emulator/sys/common/erl_poll.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/sys/common/erl_poll.c b/erts/emulator/sys/common/erl_poll.c
index 27ffba58bd..c71d23f58c 100644
--- a/erts/emulator/sys/common/erl_poll.c
+++ b/erts/emulator/sys/common/erl_poll.c
@@ -872,8 +872,8 @@ update_pollset(ErtsPollSet *ps, int fd, ErtsPollOp op, ErtsPollEvents events)
}
}
-#if defined(EV_DISPATCH) && !defined(__OpenBSD__)
- /* If we have EV_DISPATCH we use it, unless we are on OpenBSD as the
+#if defined(EV_DISPATCH) && !(defined(__OpenBSD__) || defined(__NetBSD__))
+ /* If we have EV_DISPATCH we use it, unless we are on OpenBSD/NetBSD as the
behavior of EV_EOF seems to be edge triggered there and we need it
to be level triggered.