Fixing Mach-O bustage

modules/plugin/base/src/nsPluginHostImpl.cpp

@@ -174,15 +174,10 @@
 #endif
 #endif
 
-#if defined(XP_MAC) && TARGET_CARBON                                            
+#if defined(XP_MAC) && TARGET_CARBON
 #include "nsIClassicPluginFactory.h"
-#endif
-
-#if defined(XP_MAC) || defined(XP_MACOSX)
-#if TARGET_CARBON
 #include <TextServices.h>  // for ::UseInputWindow()
 #endif
-#endif
 
 // this is the name of the directory which will be created
 // to cache temporary files.
@@ -4609,8 +4604,7 @@ NS_IMETHODIMP nsPluginHostImpl::GetPluginFactory(const char *aMimeType, nsIPlugi
       }
     }
 
-#if defined(XP_MAC) || defined(XP_MACOSX)
-#if TARGET_CARBON
+#if defined(XP_MAC) && TARGET_CARBON
    /* Flash 6.0 r50 and older on Mac has a bug which calls ::UseInputWindow(NULL, true) 
       which turn off all our inline IME. Turn it back after the plugin 
       initializtion and hope that future versions will be fixed. See bug 159016
@@ -4622,7 +4616,6 @@ NS_IMETHODIMP nsPluginHostImpl::GetPluginFactory(const char *aMimeType, nsIPlugi
          ::UseInputWindow(NULL, false);
        }
     }
-#endif
 #endif
 
     if (plugin != nsnull)