summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsrinivas%netscape.com <devnull@localhost>1999-12-24 02:07:15 +0000
committersrinivas%netscape.com <devnull@localhost>1999-12-24 02:07:15 +0000
commitcedf386dd2a4c3d1ad27b1d5aa2bb19b5834cb1e (patch)
tree01b931660330e6f09767f040daa77d5929734a13
parent3481d6af56191bb7dde466555ad0ea040140adb9 (diff)
downloadnspr-hg-cedf386dd2a4c3d1ad27b1d5aa2bb19b5834cb1e.tar.gz
Backed out previous checkin for build breakage on Mac/Win.
-rw-r--r--pr/src/threads/prcthr.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/pr/src/threads/prcthr.c b/pr/src/threads/prcthr.c
index bd3a1b49..5a4fa502 100644
--- a/pr/src/threads/prcthr.c
+++ b/pr/src/threads/prcthr.c
@@ -171,7 +171,7 @@ PR_IMPLEMENT(PRStatus) PR_Interrupt(PRThread *thread)
thread->flags |= _PR_INTERRUPT;
victim = thread->wait.cvar;
_PR_THREAD_UNLOCK(thread);
- if ((NULL != victim) && !thread->interrupt_blocked) {
+ if (NULL != victim) {
int haveLock = (victim->lock->owner == _PR_MD_CURRENT_THREAD());
if (!haveLock) PR_Lock(victim->lock);
@@ -194,8 +194,7 @@ PR_IMPLEMENT(PRStatus) PR_Interrupt(PRThread *thread)
* call is made with thread locked;
* on return lock is released
*/
- if (!thread->interrupt_blocked)
- _PR_NotifyLockedThread(thread);
+ _PR_NotifyLockedThread(thread);
break;
case _PR_IO_WAIT:
/*
@@ -204,8 +203,7 @@ PR_IMPLEMENT(PRStatus) PR_Interrupt(PRThread *thread)
* released.
*/
#if defined(XP_UNIX) || defined(WINNT) || defined(WIN16)
- if (!thread->interrupt_blocked)
- _PR_Unblock_IO_Wait(thread);
+ _PR_Unblock_IO_Wait(thread);
#else
_PR_THREAD_UNLOCK(thread);
#endif