From 81587a95382273bd0c2c5eb00a40df1f69d220e2 Mon Sep 17 00:00:00 2001 From: "wtc%netscape.com" Date: Fri, 11 Jul 2003 21:52:04 +0000 Subject: [PATCH] Backed out Bob Relyea's workaround for the deadlock in rev. 1.15. The correct fix is in rev. 1.36 of tdcache.c (see Bugzilla bug 212112). git-svn-id: svn://10.0.0.236/trunk@144744 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/security/nss/lib/dev/devslot.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/mozilla/security/nss/lib/dev/devslot.c b/mozilla/security/nss/lib/dev/devslot.c index ca3c7a13587..18f11f020c7 100644 --- a/mozilla/security/nss/lib/dev/devslot.c +++ b/mozilla/security/nss/lib/dev/devslot.c @@ -32,7 +32,7 @@ */ #ifdef DEBUG -static const char CVS_ID[] = "@(#) $RCSfile: devslot.c,v $ $Revision: 1.16 $ $Date: 2003-07-01 00:32:20 $ $Name: not supported by cvs2svn $"; +static const char CVS_ID[] = "@(#) $RCSfile: devslot.c,v $ $Revision: 1.17 $ $Date: 2003-07-11 21:52:04 $ $Name: not supported by cvs2svn $"; #endif /* DEBUG */ #ifndef NSSCKEPV_H @@ -48,11 +48,7 @@ static const char CVS_ID[] = "@(#) $RCSfile: devslot.c,v $ $Revision: 1.16 $ $Da #endif /* CKHELPER_H */ /* measured in seconds */ -#ifdef DARWIN -#define NSSSLOT_TOKEN_DELAY_TIME 3 -#else #define NSSSLOT_TOKEN_DELAY_TIME 1 -#endif /* this should track global and per-transaction login information */