Update NSS to 3.21 RTM and NSPR to 4.11 RTM

nss/lib/util/secport.c

Index: nss/lib/util/secport.c
diff --git a/nss/lib/util/secport.c b/nss/lib/util/secport.c
index 106399d245c3d0c15e23be6f25cd99446c0219a7..723d89b351d9bb0cd1aa8f94a848589a2837fb21 100644
--- a/nss/lib/util/secport.c
+++ b/nss/lib/util/secport.c
@@ -466,7 +466,7 @@ port_ArenaRelease(PLArenaPool *arena, void *mark, PRBool zero)
 	PZ_Lock(pool->lock);
 #ifdef THREADMARK
 	{
-	    threadmark_mark **pw, *tm;
+	    threadmark_mark **pw;
 
 	    if (PR_GetCurrentThread() != pool->marking_thread ) {
 		PZ_Unlock(pool->lock);
@@ -488,7 +488,6 @@ port_ArenaRelease(PLArenaPool *arena, void *mark, PRBool zero)
 		return /* no error indication available */ ;
 	    }
 
-	    tm = *pw;
 	    *pw = (threadmark_mark *)NULL;
 
 	    if (zero) {
@@ -536,7 +535,7 @@ PORT_ArenaUnmark(PLArenaPool *arena, void *mark)
 #ifdef THREADMARK
     PORTArenaPool *pool = (PORTArenaPool *)arena;
     if (ARENAPOOL_MAGIC == pool->magic ) {
-	threadmark_mark **pw, *tm;
+	threadmark_mark **pw;
 
 	PZ_Lock(pool->lock);
 
@@ -560,7 +559,6 @@ PORT_ArenaUnmark(PLArenaPool *arena, void *mark)
 	    return /* no error indication available */ ;
 	}
 
-	tm = *pw;
 	*pw = (threadmark_mark *)NULL;
 
 	if (! pool->first_mark ) {