update NSPR to 4.24 and keep NSPR Bug 1586070 and win64 patch intact.

This commit is contained in:
Roy Tam 2020-01-03 13:34:04 +08:00
commit 0b9855b841
487 changed files with 42933 additions and 48679 deletions

View file

@ -30,8 +30,9 @@ static void Help(void)
static void Dull(void *arg)
{
PR_Sleep(PR_SecondsToInterval(dally));
if (verbose && force)
if (verbose && force) {
PR_fprintf(err, "If you see this, the test failed\n");
}
} /* Dull */
static PRIntn PR_CALLBACK RealMain(PRIntn argc, char **argv)
@ -43,38 +44,42 @@ static PRIntn PR_CALLBACK RealMain(PRIntn argc, char **argv)
while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
{
if (PL_OPT_BAD == os) continue;
if (PL_OPT_BAD == os) {
continue;
}
switch (opt->option)
{
case 'd': /* verbosity */
verbose = PR_TRUE;
break;
case 'x': /* force exit */
force = PR_TRUE;
break;
case 't': /* seconds to dally in child */
dally = atoi(opt->value);
break;
case 'h': /* user wants some guidance */
default:
Help(); /* so give him an earful */
return 2; /* but not a lot else */
case 'd': /* verbosity */
verbose = PR_TRUE;
break;
case 'x': /* force exit */
force = PR_TRUE;
break;
case 't': /* seconds to dally in child */
dally = atoi(opt->value);
break;
case 'h': /* user wants some guidance */
default:
Help(); /* so give him an earful */
return 2; /* but not a lot else */
}
}
PL_DestroyOptState(opt);
if (0 == dally) dally = 10;
if (0 == dally) {
dally = 10;
}
/*
* Create LOCAL and GLOBAL threads
*/
/*
* Create LOCAL and GLOBAL threads
*/
(void)PR_CreateThread(
PR_USER_THREAD, Dull, NULL, PR_PRIORITY_NORMAL,
PR_LOCAL_THREAD, PR_UNJOINABLE_THREAD, 0);
PR_LOCAL_THREAD, PR_UNJOINABLE_THREAD, 0);
(void)PR_CreateThread(
PR_USER_THREAD, Dull, NULL, PR_PRIORITY_NORMAL,
PR_GLOBAL_THREAD, PR_UNJOINABLE_THREAD, 0);
PR_GLOBAL_THREAD, PR_UNJOINABLE_THREAD, 0);
if (verbose)
PR_fprintf(
@ -91,14 +96,14 @@ static PRIntn PR_CALLBACK RealMain(PRIntn argc, char **argv)
}
}
return 0;
}
int main(int argc, char **argv)
{
PRIntn rv;
PR_STDIO_INIT();
rv = PR_Initialize(RealMain, argc, argv, 0);
return rv;