rename files to .mm. b=419390,419392 r/sr=roc

uriloader/exthandler/Makefile.in

@@ -54,7 +54,7 @@ else
 ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
 OSDIR		= win
 else
-ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
+ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
 OSDIR		= mac
 else
 ifeq ($(MOZ_WIDGET_TOOLKIT),beos)
@@ -92,19 +92,18 @@ ifdef MOZ_PHOENIX
 REQUIRES	+= toolkitcomps
 endif
 
-ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
+ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
 REQUIRES		+= windowwatcher \
 	             $(NULL)
-endif
 
-OSHELPER	= nsOSHelperAppService.cpp
-
-ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
-OSHELPER		+= nsInternetConfig.cpp \
-			nsInternetConfigService.cpp \
-			nsMIMEInfoMac.cpp \
-			nsLocalHandlerAppMac.cpp \
+CMMSRCS	= nsOSHelperAppService.mm \
+			nsInternetConfig.mm \
+			nsInternetConfigService.mm \
+			nsMIMEInfoMac.mm \
+			nsLocalHandlerAppMac.mm \
 			$(NULL)
+else
+OSHELPER	= nsOSHelperAppService.cpp
 endif
 
 LOCAL_INCLUDES = -I$(srcdir)
@@ -141,7 +140,7 @@ XPIDLSRCS = \
 	nsIHandlerService.idl	\
 	$(NULL)
 
-ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
+ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
 XPIDLSRCS		+= nsIInternetConfigService.idl
 endif
 

uriloader/exthandler/mac/nsInternetConfig.mm

@@ -40,7 +40,6 @@
 #include "nsReadableUtils.h"
 #include "nsDebug.h"
 
-#include <CodeFragments.h>   
 #include <Processes.h>
 ICInstance nsInternetConfig::sInstance = NULL;
 long nsInternetConfig::sSeed = 0;
@@ -80,9 +79,6 @@ ICInstance nsInternetConfig::GetInstance()
 		}
 		else
 		{
-#if !TARGET_CARBON
-			::ICFindConfigFile( sInstance, 0 , nil );
-#endif
 			::ICGetSeed( sInstance, &sSeed );
 		}
 	}

xpcom/io/Makefile.in

@@ -57,7 +57,7 @@ MODULE_OPTIMIZE_FLAGS = -Os -fno-strict-aliasing
 endif
 endif
 
-ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
+ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
 REQUIRES		+= macmorefiles
 endif
 
@@ -91,8 +91,8 @@ endif
 ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
 CPPSRCS		+= nsLocalFileOS2.cpp
 else
-ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
-CPPSRCS		+= nsLocalFileOSX.cpp
+ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
+CMMSRCS		= nsLocalFileOSX.mm
 else
 ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
 CPPSRCS		+= nsLocalFileWin.cpp
@@ -120,7 +120,7 @@ EXPORTS		= \
 ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
 EXPORTS		+= nsLocalFileOS2.h
 else
-ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
+ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
 EXPORTS		+= nsLocalFileOSX.h
 else
 ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
@@ -128,7 +128,7 @@ EXPORTS		+= nsLocalFileWin.h
 else
 EXPORTS		+= nsLocalFileUnix.h
 endif # windows
-endif # mac
+endif # cocoa
 endif # os2
 
 XPIDLSRCS	= \
@@ -161,9 +161,9 @@ XPIDLSRCS	= \
 ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
 XPIDLSRCS	+= nsILocalFileOS2.idl
 else
-ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
+ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
 XPIDLSRCS	+= nsILocalFileMac.idl
-endif # mac
+endif # cocoa
 endif # os2
 
 SDK_XPIDLSRCS   = \