Changeset 960 in vbox for trunk/src/libs/xpcom18a4/xpcom

Timestamp:

Feb 17, 2007 9:12:10 AM (18 years ago)

Author:

vboxsync

Message:

Darwin hacking.

File:

• trunk/src/libs/xpcom18a4/xpcom/glue/standalone/nsXPCOMGlue.cpp (modified) (5 diffs)

trunk/src/libs/xpcom18a4/xpcom/glue/standalone/nsXPCOMGlue.cpp

@@ -111 +111 @@
 
         xpcomLib = PR_LoadLibraryWithFlags(libSpec, PR_LD_LAZY|PR_LD_GLOBAL);
+#ifdef __DARWIN__
+        /* works around bundle problem. */
+        if (!xpcomLib) {
+            const char *home = PR_GetEnv("VBOX_XPCOM_HOME");
+            if (home) {
+                char path[PATH_MAX];
+                snprintf(path, sizeof(path), "%s/%s", home, libSpec.value.pathname);
+                libSpec.value.pathname = path;
+                xpcomLib = PR_LoadLibraryWithFlags(libSpec, PR_LD_LAZY|PR_LD_GLOBAL);
+            }
+        }
+#endif
         if (!xpcomLib)
             return NS_ERROR_FAILURE;
@@ -162 +174 @@
         xpcomLib = nsnull;
     }
-    
+
     memset(&xpcomFunctions, 0, sizeof(xpcomFunctions));
     return NS_OK;
@@ -170 +182 @@
 #ifndef XPCOM_GLUE_NO_DYNAMIC_LOADING
 extern "C" NS_COM nsresult
-NS_InitXPCOM2(nsIServiceManager* *result, 
+NS_InitXPCOM2(nsIServiceManager* *result,
               nsIFile* binDirectory,
               nsIDirectoryServiceProvider* appFileLocationProvider)
@@ -442 +454 @@
       }
   }
-                 
+
 #if XP_WIN32
-  // On windows, the current directory is searched before the 
-  // PATH environment variable.  This is a very bad thing 
+  // On windows, the current directory is searched before the
+  // PATH environment variable.  This is a very bad thing
   // since libraries in the cwd will be picked up before
   // any that are in either the application or GRE directory.
@@ -465 +477 @@
     // Startup the XPCOM Glue that links us up with XPCOM.
     nsresult rv = XPCOMGlueStartup(xpcomLocation);
-    
+
     if (NS_FAILED(rv)) {
         NS_WARNING("gre: XPCOMGlueStartup failed");