diff --git a/mozilla/editor/txmgr/macbuild/txmgr.mcp b/mozilla/editor/txmgr/macbuild/txmgr.mcp index 29521b95715..d8a9b58a6c0 100644 Binary files a/mozilla/editor/txmgr/macbuild/txmgr.mcp and b/mozilla/editor/txmgr/macbuild/txmgr.mcp differ diff --git a/mozilla/editor/txmgr/src/nsTransactionManagerFactory.cpp b/mozilla/editor/txmgr/src/nsTransactionManagerFactory.cpp index 9ea9aa350c6..4c47f5dd829 100644 --- a/mozilla/editor/txmgr/src/nsTransactionManagerFactory.cpp +++ b/mozilla/editor/txmgr/src/nsTransactionManagerFactory.cpp @@ -112,11 +112,7 @@ nsresult nsTransactionManagerFactory::LockFactory(PRBool aLock) } // return the proper factory to the caller -#if defined(XP_MAC) && defined(MAC_STATIC) -extern "C" /* NS_TRANSACTIONMANAGER */ nsresult NSGetFactory_TRANSACTIONMANAGER_DLL(const nsCID &aClass, nsIFactory **aFactory) -#else -extern "C" /* NS_TRANSACTIONMANAGER */ nsresult NSGetFactory(const nsCID &aClass, nsIFactory **aFactory) -#endif +extern "C" /* NS_TRANSACTIONMANAGER */ NS_EXPORT nsresult NSGetFactory(const nsCID &aClass, nsIFactory **aFactory) { if (!aFactory) return NS_ERROR_NULL_POINTER; diff --git a/mozilla/editor/txmgr/tests/macbuild/txmgrTEST.mcp b/mozilla/editor/txmgr/tests/macbuild/txmgrTEST.mcp index 91aa4e24daf..6e40a961222 100644 Binary files a/mozilla/editor/txmgr/tests/macbuild/txmgrTEST.mcp and b/mozilla/editor/txmgr/tests/macbuild/txmgrTEST.mcp differ