diff options
| author | wtchang%redhat.com <devnull@localhost> | 2005-03-28 20:45:37 +0000 |
|---|---|---|
| committer | wtchang%redhat.com <devnull@localhost> | 2005-03-28 20:45:37 +0000 |
| commit | 627a598c1f20456d01ec4d9d034735da0227a4ac (patch) | |
| tree | 5d4adb4b0e6964f159d8ec17e82856123c8ca289 /security/nss/lib/pk11wrap/pk11list.c | |
| parent | e03b9c8cefce17235b9877f94c5f9bb73df22e29 (diff) | |
| download | nss-hg-627a598c1f20456d01ec4d9d034735da0227a4ac.tar.gz | |
Bugzilla Bug 286439: Removed PKCS11_USE_THREADS and PK11_USE_THREADS.
r=relyea,nelsonb.
Modified Files:
pk11wrap/pk11list.c pk11wrap/pk11pars.c pk11wrap/pk11skey.c
pk11wrap/pk11slot.c pk11wrap/pk11util.c pk11wrap/secmod.h
pk11wrap/secmodi.h pk11wrap/secmodt.h pk11wrap/secmodti.h
softoken/pkcs11.c softoken/pkcs11i.h softoken/pkcs11u.c
Diffstat (limited to 'security/nss/lib/pk11wrap/pk11list.c')
| -rw-r--r-- | security/nss/lib/pk11wrap/pk11list.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/security/nss/lib/pk11wrap/pk11list.c b/security/nss/lib/pk11wrap/pk11list.c index 3baaef921..24885b832 100644 --- a/security/nss/lib/pk11wrap/pk11list.c +++ b/security/nss/lib/pk11wrap/pk11list.c @@ -50,11 +50,7 @@ */ SECMODListLock *SECMOD_NewListLock() { -#ifdef PKCS11_USE_THREADS - return (SECMODListLock *) NSSRWLock_New( 10, "moduleListLock"); -#else - return (SECMODListLock *) 1; -#endif + return NSSRWLock_New( 10, "moduleListLock"); } /* @@ -62,7 +58,7 @@ SECMODListLock *SECMOD_NewListLock() */ void SECMOD_DestroyListLock(SECMODListLock *lock) { - PK11_USE_THREADS(NSSRWLock_Destroy((NSSRWLock *)lock);) + NSSRWLock_Destroy(lock); } @@ -72,7 +68,7 @@ void SECMOD_DestroyListLock(SECMODListLock *lock) */ void SECMOD_GetReadLock(SECMODListLock *modLock) { - PK11_USE_THREADS(NSSRWLock_LockRead((NSSRWLock *)modLock);) + NSSRWLock_LockRead(modLock); } /* @@ -80,7 +76,7 @@ void SECMOD_GetReadLock(SECMODListLock *modLock) */ void SECMOD_ReleaseReadLock(SECMODListLock *modLock) { - PK11_USE_THREADS(NSSRWLock_UnlockRead((NSSRWLock *)modLock);) + NSSRWLock_UnlockRead(modLock); } @@ -89,7 +85,7 @@ void SECMOD_ReleaseReadLock(SECMODListLock *modLock) */ void SECMOD_GetWriteLock(SECMODListLock *modLock) { - PK11_USE_THREADS(NSSRWLock_LockWrite((NSSRWLock *)modLock);) + NSSRWLock_LockWrite(modLock); } @@ -99,7 +95,7 @@ void SECMOD_GetWriteLock(SECMODListLock *modLock) */ void SECMOD_ReleaseWriteLock(SECMODListLock *modLock) { - PK11_USE_THREADS(NSSRWLock_UnlockWrite((NSSRWLock *)modLock);) + NSSRWLock_UnlockWrite(modLock); } |