Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(584)

Unified Diff: patches/nss-static2.patch

Issue 10961060: Update NSS to NSS 3.14 Beta 1. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/nss/
Patch Set: Merge nss-static2.patch into nss-static.patch Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: patches/nss-static2.patch
===================================================================
--- patches/nss-static2.patch (revision 158129)
+++ patches/nss-static2.patch (working copy)
@@ -1,14 +0,0 @@
-Index: mozilla/security/nss/lib/pk11wrap/pk11load.c
-===================================================================
---- mozilla/security/nss/lib/pk11wrap/pk11load.c (revision 135940)
-+++ mozilla/security/nss/lib/pk11wrap/pk11load.c (working copy)
-@@ -483,7 +483,9 @@
- mod->moduleDBFunc = (void *)
- PR_FindSymbol(library, "NSS_ReturnModuleSpecData");
- }
-+#if defined(NSS_STATIC) && !defined(NSS_DISABLE_ROOT_CERTS)
- library_loaded:
-+#endif
- if (mod->moduleDBFunc == NULL) mod->isModuleDB = PR_FALSE;
- if (entry == NULL) {
- if (mod->isModuleDB) {

Powered by Google App Engine
This is Rietveld 408576698