Update to NSS 3.12.7 and NSPR 4.8.6....

nss/mozilla/nsprpub/pr/src/malloc/prmem.c

 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
  *
  * Software distributed under the License is distributed on an "AS IS" basis,
@@ skipping 99 matching lines @@
 
 /*
 ** pr_FindSymbolInProg
 **
 ** Find the specified data symbol in the program and return
 ** its address.
 */
 
 #ifdef HAVE_DLL
 
-#ifdef USE_DLFCN
+#if defined(USE_DLFCN) && !defined(NO_DLOPEN_NULL)
 
 #include <dlfcn.h>
 
 static void *
 pr_FindSymbolInProg(const char *name)
 {
     void *h;
     void *sym;
 
     h = dlopen(0, RTLD_LAZY);
@@ skipping 12 matching lines @@
 pr_FindSymbolInProg(const char *name)
 {
     shl_t h = NULL;
     void *sym;
 
     if (shl_findsym(&h, name, TYPE_DATA, &sym) == -1)
         return NULL;
     return sym;
 }
 
-#elif defined(USE_MACH_DYLD)
+#elif defined(USE_MACH_DYLD) || defined(NO_DLOPEN_NULL)
 
 static void *
 pr_FindSymbolInProg(const char *name)
 {
     /* FIXME: not implemented */
     return NULL;
 }
 
 #else
 
@@ skipping 553 matching lines @@
 }
 
 void _PR_InitMem(void)
 {
     PRStatus rv;
     rv = _PR_MallocInit();
     PR_ASSERT(PR_SUCCESS == rv);
 }
 
 #endif /* _PR_OVERRIDE_MALLOC */