Update NSS to 3.21 RTM and NSPR to 4.11 RTM

nss/lib/util/secport.h

 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /*
  * secport.h - portability interfaces for security libraries
  */
 
 #ifndef _SECPORT_H_
 #define _SECPORT_H_
@@ skipping 69 matching lines @@
                             size_t oldsize, size_t newsize);
 extern void *PORT_ArenaMark(PLArenaPool *arena);
 extern void PORT_ArenaRelease(PLArenaPool *arena, void *mark);
 extern void PORT_ArenaZRelease(PLArenaPool *arena, void *mark);
 extern void PORT_ArenaUnmark(PLArenaPool *arena, void *mark);
 extern char *PORT_ArenaStrdup(PLArenaPool *arena, const char *str);
 
 SEC_END_PROTOS
 
 #define PORT_Assert PR_ASSERT
+/* This runs a function that should return SECSuccess.
+ * Intended for NSS internal use only.
+ * The return value is asserted in a debug build, otherwise it is ignored.
+ * This is no substitute for proper error handling.  It is OK only if you
+ * have ensured that the function cannot fail by other means such as checking
+ * prerequisites.  In that case this can be used as a safeguard against
+ * unexpected changes in a function.
+ */
+#ifdef DEBUG
+#define PORT_CheckSuccess(f) PR_ASSERT((f) == SECSuccess)
+#else
+#define PORT_CheckSuccess(f) (f)
+#endif
 #define PORT_ZNew(type) (type*)PORT_ZAlloc(sizeof(type))
 #define PORT_New(type) (type*)PORT_Alloc(sizeof(type))
 #define PORT_ArenaNew(poolp, type)      \
                 (type*) PORT_ArenaAlloc(poolp, sizeof(type))
 #define PORT_ArenaZNew(poolp, type)     \
                 (type*) PORT_ArenaZAlloc(poolp, sizeof(type))
 #define PORT_NewArray(type, num)        \
                 (type*) PORT_Alloc (sizeof(type)*(num))
 #define PORT_ZNewArray(type, num)       \
                 (type*) PORT_ZAlloc (sizeof(type)*(num))
@@ skipping 143 matching lines @@
  */
 PRLibrary *
 PORT_LoadLibraryFromOrigin(const char* existingShLibName,
                  PRFuncPtr staticShLibFunc,
                  const char *newShLibName);
 #endif  /* NSS_STATIC */
 
 SEC_END_PROTOS
 
 #endif /* _SECPORT_H_ */