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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: nss/mozilla/nsprpub/pr/src/malloc/prmem.c

Issue 3135002: Update to NSS 3.12.7 and NSPR 4.8.6.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/
Patch Set: Created 10 years, 4 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
« no previous file with comments | « nss/mozilla/nsprpub/pr/src/linking/prlink.c ('k') | nss/mozilla/nsprpub/pr/src/md/unix/uxrng.c » ('j') | nss/mozilla/security/nss/lib/cryptohi/seckey.c » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: nss/mozilla/nsprpub/pr/src/malloc/prmem.c
===================================================================
--- nss/mozilla/nsprpub/pr/src/malloc/prmem.c (revision 55475)
+++ nss/mozilla/nsprpub/pr/src/malloc/prmem.c (working copy)
@@ -117,7 +117,7 @@
#ifdef HAVE_DLL
-#ifdef USE_DLFCN
+#if defined(USE_DLFCN) && !defined(NO_DLOPEN_NULL)
#include <dlfcn.h>
@@ -150,7 +150,7 @@
return sym;
}
-#elif defined(USE_MACH_DYLD)
+#elif defined(USE_MACH_DYLD) || defined(NO_DLOPEN_NULL)
static void *
pr_FindSymbolInProg(const char *name)
« no previous file with comments | « nss/mozilla/nsprpub/pr/src/linking/prlink.c ('k') | nss/mozilla/nsprpub/pr/src/md/unix/uxrng.c » ('j') | nss/mozilla/security/nss/lib/cryptohi/seckey.c » ('J')

Powered by Google App Engine
This is Rietveld 408576698