Update NSS to 3.21 RTM and NSPR to 4.11 RTM

nss/lib/nss/nssinit.c

Index: nss/lib/nss/nssinit.c
diff --git a/nss/lib/nss/nssinit.c b/nss/lib/nss/nssinit.c
index 208e71dd3cd390643526d975350bd3b0c1f8fa46..d49003785c4c07a0ecf16d152d745004b3b452ec 100644
--- a/nss/lib/nss/nssinit.c
+++ b/nss/lib/nss/nssinit.c
@@ -493,10 +493,6 @@ struct NSSInitContextStr {
 #define NSS_INIT_MAGIC 0x1413A91C
 static SECStatus nss_InitShutdownList(void);
 
-#ifdef DEBUG
-static CERTCertificate dummyCert;
-#endif
-
 /* All initialized to zero in BSS */
 static PRCallOnceType nssInitOnce;
 static PZLock *nssInitLock;
@@ -575,8 +571,11 @@ nss_Init(const char *configdir, const char *certPrefix, const char *keyPrefix,
      * functions */
 
     if (!isReallyInitted) {
+#ifdef DEBUG
+        CERTCertificate dummyCert;
 	/* New option bits must not change the size of CERTCertificate. */
 	PORT_Assert(sizeof(dummyCert.options) == sizeof(void *));
+#endif
 
 	if (SECSuccess != cert_InitLocks()) {
 	    goto loser;
@@ -1238,8 +1237,7 @@ NSS_IsInitialized(void)
 }
 	
 
-extern const char __nss_base_rcsid[];
-extern const char __nss_base_sccsid[];
+extern const char __nss_base_version[];
 
 PRBool
 NSS_VersionCheck(const char *importedVersion)
@@ -1255,9 +1253,8 @@ NSS_VersionCheck(const char *importedVersion)
      */
     int vmajor = 0, vminor = 0, vpatch = 0, vbuild = 0;
     const char *ptr = importedVersion;
-    volatile char c; /* force a reference that won't get optimized away */
-
-    c = __nss_base_rcsid[0] + __nss_base_sccsid[0]; 
+#define NSS_VERSION_VARIABLE __nss_base_version
+#include "verref.h"
 
     while (isdigit(*ptr)) {
         vmajor = 10 * vmajor + *ptr - '0';