From a252d5100e5d9d3705f9469cd347fcafc5ac1e31 Mon Sep 17 00:00:00 2001
From: "wtc%netscape.com"
 <wtc%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sun, 23 Feb 2003 02:38:14 +0000
Subject: [PATCH] Backed out the previous checkin.  Mozilla Tinderbox is
 failing a test.  I just wanted to rule out the previous checkin as a possible
 cause. Tag: NSPRPUB_PRE_4_2_CLIENT_BRANCH

git-svn-id: svn://10.0.0.236/branches/NSPRPUB_PRE_4_2_CLIENT_BRANCH@138257 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/nsprpub/pr/src/linking/prlink.c | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

diff --git a/mozilla/nsprpub/pr/src/linking/prlink.c b/mozilla/nsprpub/pr/src/linking/prlink.c
index 28377d8b61b..6b9f94a433e 100644
--- a/mozilla/nsprpub/pr/src/linking/prlink.c
+++ b/mozilla/nsprpub/pr/src/linking/prlink.c
@@ -134,7 +134,6 @@ struct PRLibrary {
 
 #if defined(XP_MACOSX)
     CFMutableDictionaryRef      wrappers;
-    const struct mach_header*   image;
 #endif /* XP_MACOSX */
 #endif
 
@@ -816,10 +815,7 @@ static PRStatus
 pr_LoadViaDyld(const char *name, PRLibrary *lm)
 {
     lm->dlh = pr_LoadMachDyldModule(name);
-    if (lm->dlh == NULL) {
-        lm->image = NSAddImage(name, NSADDIMAGE_OPTION_NONE);
-    }
-    return (lm->dlh != NULL || lm->image != NULL) ? PR_SUCCESS : PR_FAILURE;
+    return (lm->dlh != NULL) ? PR_SUCCESS : PR_FAILURE;
 }
 #endif
 
@@ -1273,7 +1269,7 @@ PR_UnloadLibrary(PRLibrary *lib)
 #elif defined(USE_HPSHL)
     result = shl_unload(lib->dlh);
 #elif defined(USE_MACH_DYLD)
-    result = NSUnLinkModule(lib->dlh, NSUNLINKMODULE_OPTION_NONE);
+    result = NSUnLinkModule(lib->dlh, FALSE);
 #else
 #error Configuration error
 #endif
@@ -1297,7 +1293,6 @@ PR_UnloadLibrary(PRLibrary *lib)
 #if defined(XP_MACOSX)
     if (lib->wrappers)
         CFRelease(lib->wrappers);
-    /* No way to unload an image (lib->image) */
 #endif
 #endif
 
@@ -1415,17 +1410,6 @@ pr_FindSymbolInLib(PRLibrary *lm, const char *name)
         
         if (f == NULL && strcmp(name + SYM_OFFSET, "main") == 0) f = lm->main;
     }
-#if defined(XP_MACOSX)
-    if (lm->image) {
-        NSSymbol symbol;
-        symbol = NSLookupSymbolInImage(lm->image, name,
-                                       NSLOOKUPSYMBOLINIMAGE_OPTION_BIND);
-        if (symbol != NULL)
-            f = NSAddressOfSymbol(symbol);
-        else
-            f = NULL;
-    }
-#endif
 #undef SYM_OFFSET
 #endif /* XP_MAC */