diff options
| author | Jeroen Ruigrok van der Werven <asmodai@FreeBSD.org> | 2000-05-26 07:17:19 +0000 |
|---|---|---|
| committer | Jeroen Ruigrok van der Werven <asmodai@FreeBSD.org> | 2000-05-26 07:17:19 +0000 |
| commit | a1f80258ebd90659a76bec0da3db9a1cff2f19bf (patch) | |
| tree | 58c578d1f5a84acb9535b8fc95abe2637662f30f /contrib/bind/lib/isc/eventlib.c | |
| parent | 3664462f40b554812efa0ee39af44bb18ab65b8c (diff) | |
Notes
Diffstat (limited to 'contrib/bind/lib/isc/eventlib.c')
| -rw-r--r-- | contrib/bind/lib/isc/eventlib.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/contrib/bind/lib/isc/eventlib.c b/contrib/bind/lib/isc/eventlib.c index 6cb227b0f3fa..cea98ac933eb 100644 --- a/contrib/bind/lib/isc/eventlib.c +++ b/contrib/bind/lib/isc/eventlib.c @@ -20,7 +20,7 @@ */ #if !defined(LINT) && !defined(CODECENTER) -static const char rcsid[] = "$Id: eventlib.c,v 1.44 1999/10/13 17:11:20 vixie Exp $"; +static const char rcsid[] = "$Id: eventlib.c,v 1.45 2000/02/04 07:25:39 vixie Exp $"; #endif #include "port_before.h" @@ -345,7 +345,8 @@ evGetNext(evContext opaqueCtx, evEvent *opaqueEv, int options) { } ERR(pselect_errno); } - if (x == 0 && (nextTimer && !timerPast) && (options & EV_POLL)) + if (x == 0 && (nextTimer == NULL || !timerPast) && + (options & EV_POLL)) ERR(EWOULDBLOCK); ctx->fdCount = x; #ifdef EVENTLIB_TIME_CHECKS |