diff --git a/layout/build/nsLayoutFactory.cpp b/layout/build/nsLayoutFactory.cpp
index dc191b34cca6..cb9404cb39b7 100644
--- a/layout/build/nsLayoutFactory.cpp
+++ b/layout/build/nsLayoutFactory.cpp
@@ -240,8 +240,13 @@ nsIDOMNativeObjectRegistry *NativeObjectRegistryManager::gRegistry = nsnull;
 static NativeObjectRegistryManager gManager;
 
 // return the proper factory to the caller
-#ifdef XP_MAC
+#ifdef MAC_STATIC
 extern "C" NS_LAYOUT nsresult NSGetFactory_LAYOUT_DLL(const nsCID &aClass, nsIFactory **aFactory)
+#elif defined(MAC_SHARED)
+#pragma export on
+extern "C" NS_LAYOUT nsresult NSGetFactory(const nsCID &aClass, nsIFactory **aFactory)
+#pragma export off
+// for non-mac platforms:
 #else
 extern "C" NS_LAYOUT nsresult NSGetFactory(const nsCID &aClass, nsIFactory **aFactory)
 #endif
diff --git a/layout/macbuild/layout.mcp b/layout/macbuild/layout.mcp
index 1f5a1bcd725a..cc9f52a4e3f8 100644
Binary files a/layout/macbuild/layout.mcp and b/layout/macbuild/layout.mcp differ