Bug 795987: Upgrade NSPR to NSPR_4_9_3_RTM. Includes a patch for

bug 749849.
This commit is contained in:
Wan-Teh Chang 2012-10-24 12:37:30 -07:00
parent ce88c1ca2d
commit 7ec7be599b
4 changed files with 8 additions and 9 deletions

View File

@ -1 +1 @@
NSPR_4_9_3_BETA2
NSPR_4_9_3_RTM

View File

@ -10,3 +10,4 @@
*/
#error "Do not include this header file."

View File

@ -31,11 +31,11 @@ PR_BEGIN_EXTERN_C
** The format of the version string is
** "<major version>.<minor version>[.<patch level>] [<Beta>]"
*/
#define PR_VERSION "4.9.3 Beta"
#define PR_VERSION "4.9.3"
#define PR_VMAJOR 4
#define PR_VMINOR 9
#define PR_VPATCH 3
#define PR_BETA PR_TRUE
#define PR_BETA PR_FALSE
/*
** PRVersionCheck

View File

@ -1016,16 +1016,14 @@ PR_IMPLEMENT(PRStatus) PR_Cleanup(void)
PR_ASSERT(0 == rv);
/*
* I am not sure if it's safe to delete the cv and lock here,
* since there may still be "system" or "foreign" threads
* around. If this call isn't immediately prior to exiting,
* then there's a problem.
* since there may still be "system" threads around. If this
* call isn't immediately prior to exiting, then there's a
* problem.
*/
if (0 == pt_book.system && NULL == pt_book.first)
if (0 == pt_book.system)
{
PR_DestroyCondVar(pt_book.cv); pt_book.cv = NULL;
PR_DestroyLock(pt_book.ml); pt_book.ml = NULL;
rv = pthread_key_delete(pt_book.key);
PR_ASSERT(0 == rv);
}
PR_DestroyLock(_pr_sleeplock);
_pr_sleeplock = NULL;