Mac specific fix. Checking in rjc's fix to load libraries if file spec was an alias to a library rather than the actual library file spec. Needed so XPCOM will work on Mac.

1 files changed, 7 insertions, 0 deletions

diff --git a/pr/src/linking/prlink.c b/pr/src/linking/prlink.c
index e21ce4ff..fa84a0fd 100644
--- a/pr/src/linking/prlink.c
+++ b/pr/src/linking/prlink.c
@@ -596,6 +596,8 @@ PR_LoadLibrary(const char *name)
         FSSpec fileSpec;
         PRUint32 index;
 
+		Boolean tempUnusedBool;	// rjc
+
         /* Copy the name: we'll change it */
         cMacPath = strdup(name);    
         if (cMacPath == NULL)
@@ -646,6 +648,11 @@ PR_LoadLibrary(const char *name)
             goto unlock;
         fileSpec.parID = pb.dirInfo.ioDrDirID;
 
+		// resolve an alias if this was one (rjc)
+		err = ResolveAliasFile(&fileSpec, true, &tempUnusedBool, &tempUnusedBool);
+		if (err != noErr)
+			goto unlock;
+
         /* Finally, try to load the library */
         err = GetDiskFragment(&fileSpec, 0, kCFragGoesToEOF, fileSpec.name, 
                         kLoadCFrag, &connectionID, &main, errName);