Permalink
Browse files

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
  • Loading branch information...
2 parents 523bb98 + 12723bc commit 7c052e0dcff8eada390264fa340a88125eedab4e @rickard-green rickard-green committed Mar 30, 2012
Showing with 1 addition and 1 deletion.
  1. +1 −1 erts/emulator/sys/common/erl_poll.c
View
2 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

0 comments on commit 7c052e0

Please sign in to comment.