diff options
| author | Rickard Green <[email protected]> | 2012-03-30 16:00:35 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2012-03-30 16:01:03 +0200 |
| commit | 7c052e0dcff8eada390264fa340a88125eedab4e (patch) | |
| tree | 464c2450aae58602e40a0fd9dd41d10692041292 /erts/emulator | |
| parent | 523bb98af56aaec320da0826daea604bd7b693f9 (diff) | |
| parent | 12723bc4ab1a01c2c1e1fe851f14b838d29898af (diff) | |
| download | otp-7c052e0dcff8eada390264fa340a88125eedab4e.tar.gz otp-7c052e0dcff8eada390264fa340a88125eedab4e.tar.bz2 otp-7c052e0dcff8eada390264fa340a88125eedab4e.zip | |
Merge branch 'rickard/erts-poll/OTP-10019' into maint
* rickard/erts-poll/OTP-10019:
Fix wakeup functionality in no thread support case
OTP-10036 is completely unrelated to this commit. Only here to trigger
info about the OTP-10036 ticket in the release notes script...
OTP-10036
Diffstat (limited to 'erts/emulator')
| -rw-r--r-- | erts/emulator/sys/common/erl_poll.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/sys/common/erl_poll.c b/erts/emulator/sys/common/erl_poll.c index 3817b1e4d5..26858052c4 100644 --- a/erts/emulator/sys/common/erl_poll.c +++ b/erts/emulator/sys/common/erl_poll.c @@ -2143,7 +2143,7 @@ ERTS_POLL_EXPORT(erts_poll_wait)(ErtsPollSet ps, void ERTS_POLL_EXPORT(erts_poll_interrupt)(ErtsPollSet ps, int set) { -#if defined(USE_THREADS) +#if defined(USE_THREADS) || ERTS_POLL_ASYNC_INTERRUPT_SUPPORT if (!set) reset_wakeup_state(ps); else |