diff --git a/mozilla/gfx/src/mac/nsGfxFactoryMac.cpp b/mozilla/gfx/src/mac/nsGfxFactoryMac.cpp
index c36448e3b9f..e2322a6c2e9 100644
--- a/mozilla/gfx/src/mac/nsGfxFactoryMac.cpp
+++ b/mozilla/gfx/src/mac/nsGfxFactoryMac.cpp
@@ -160,9 +160,9 @@ nsresult nsGfxFactoryMac::LockFactory(PRBool aLock)
 }  
 
 // return the proper factory to the caller
-#ifdef GFX_STATIC
+#ifdef MAC_STATIC
 extern "C" NS_GFXNONXP nsresult NSGetFactory_GFXWIN_DLL(const nsCID &aClass, nsIFactory **aFactory)
-#elif defined(GFX_SHARED)
+#elif defined(MAC_SHARED)
 #pragma export on
 extern "C" NS_GFXNONXP nsresult NSGetFactory(const nsCID &aClass, nsIFactory **aFactory)
 #pragma export off
diff --git a/mozilla/widget/src/mac/nsWidgetFactory.cpp b/mozilla/widget/src/mac/nsWidgetFactory.cpp
index 42de10e54d2..4cad9ea6b63 100644
--- a/mozilla/widget/src/mac/nsWidgetFactory.cpp
+++ b/mozilla/widget/src/mac/nsWidgetFactory.cpp
@@ -261,9 +261,9 @@ nsresult nsWidgetFactory::LockFactory(PRBool aLock)
 }  
 
 // return the proper factory to the caller
-#ifdef WIDGET_STATIC
+#ifdef MAC_STATIC
 extern "C" NS_WIDGET nsresult NSGetFactory_WIDGET_DLL(const nsCID &aClass, nsIFactory **aFactory)
-#elif defined(WIDGET_SHARED)
+#elif defined(MAC_SHARED)
 #pragma export on
 extern "C" NS_WIDGET nsresult NSGetFactory(const nsCID &aClass, nsIFactory **aFactory)
 #pragma export off