diff options
| author | Rickard Green <[email protected]> | 2012-03-30 16:04:19 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2012-03-30 16:04:19 +0200 |
| commit | 6e10c9013ed2ba6ff101bcde3736c6952848e687 (patch) | |
| tree | cec761be3e689cad62659824ea4fbcbd3ab9a7ec /erts | |
| parent | 83b8aafc9b5f7b75f82ec3b90ff040511a084bb0 (diff) | |
| parent | 7c052e0dcff8eada390264fa340a88125eedab4e (diff) | |
| download | otp-6e10c9013ed2ba6ff101bcde3736c6952848e687.tar.gz otp-6e10c9013ed2ba6ff101bcde3736c6952848e687.tar.bz2 otp-6e10c9013ed2ba6ff101bcde3736c6952848e687.zip | |
Merge branch 'maint'
* maint:
Fix wakeup functionality in no thread support case
Diffstat (limited to 'erts')
| -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 |