Stop using FlatCarbon headers on Mac OS X. b=482277 r=bsmedberg

2009-03-19 10:41:13 -07:00 · 2009-03-19 10:41:13 -07:00 · dde6460538
--- a/browser/components/migration/src/nsMacIEProfileMigrator.cpp
+++ b/browser/components/migration/src/nsMacIEProfileMigrator.cpp
@ -48,7 +48,7 @@
 #include "nsISupportsPrimitives.h"
 #include "nsServiceManagerUtils.h"
 #include "nsIProperties.h"
-#include <InternetConfig.h>
+#include <Carbon/Carbon.h>

 #define MACIE_BOOKMARKS_FILE_NAME NS_LITERAL_STRING("Favorites.html")
 #define MACIE_PREFERENCES_FOLDER_NAME NS_LITERAL_STRING("Explorer")
--- a/configure.in
+++ b/configure.in
@ -4851,7 +4851,6 @@ cairo-cocoa)
    AC_DEFINE(TARGET_CARBON)
    AC_DEFINE(TARGET_API_MAC_CARBON)
    TK_LIBS='-framework Carbon -framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework AddressBook'
-    TK_CFLAGS="-I${MACOS_SDK_DIR}/Developer/Headers/FlatCarbon"
    CFLAGS="$CFLAGS $TK_CFLAGS"
    CXXFLAGS="$CXXFLAGS $TK_CFLAGS"
    ;;
--- a/content/events/src/nsEventStateManager.cpp
+++ b/content/events/src/nsEventStateManager.cpp
@ -154,7 +154,7 @@
 #endif

 #ifdef XP_MACOSX
-#include <Events.h>
+#include <Carbon/Carbon.h>
 #endif

 //#define DEBUG_DOCSHELL_FOCUS
--- a/embedding/components/find/src/nsWebBrowserFind.cpp
+++ b/embedding/components/find/src/nsWebBrowserFind.cpp
@ -83,7 +83,7 @@

 #ifdef XP_MACOSX
 #include "nsAutoPtr.h"
-#include <Scrap.h>
+#include <Carbon/Carbon.h>
 #endif


--- a/gfx/thebes/src/gfxQuartzFontCache.mm
+++ b/gfx/thebes/src/gfxQuartzFontCache.mm
@ -38,7 +38,7 @@
 *
 * ***** END LICENSE BLOCK ***** */

-#include <Carbon.h>
+#include <Carbon/Carbon.h>

 #import <AppKit/AppKit.h>

--- a/intl/locale/public/nsIMacLocale.h
+++ b/intl/locale/public/nsIMacLocale.h
@ -41,7 +41,7 @@
 #include "nsISupports.h"
 #include "nscore.h"
 #include "nsString.h"
-#include <Script.h>
+#include <Carbon/Carbon.h>

 // {E58B24B2-FD1A-11d2-9E8E-0060089FE59B}
 #define NS_IMACLOCALE_IID                \
--- a/intl/locale/src/mac/nsCollationMac.cpp
+++ b/intl/locale/src/mac/nsCollationMac.cpp
@ -35,10 +35,10 @@
 * the terms of any one of the MPL, the GPL or the LGPL.
 *
 * ***** END LICENSE BLOCK ***** */
+
+#include <Carbon/Carbon.h>
+
 #include "nsCollationMac.h"
-#include <Resources.h>
-#include <TextUtils.h>
-#include <Script.h>
 #include "prmem.h"
 #include "prmon.h"
 #include "nsIServiceManager.h"
--- a/intl/locale/src/mac/nsMacLocale.cpp
+++ b/intl/locale/src/mac/nsMacLocale.cpp
@ -35,6 +35,8 @@
 *
 * ***** END LICENSE BLOCK ***** */

+#include <Carbon/Carbon.h>
+
 #include "nsISupports.h"
 #include "nscore.h"
 #include "nsString.h"
@ -43,7 +45,6 @@
 #include "nsMacLocale.h"
 #include "nsLocaleCID.h"
 #include "prprf.h"
-#include <Script.h>
 #include "nsReadableUtils.h"
 #include "nsXPCOMStrings.h"

--- a/intl/locale/src/nsLocaleService.cpp
+++ b/intl/locale/src/nsLocaleService.cpp
@ -54,7 +54,6 @@
 #  include "unidef.h"
 #  include "nsIOS2Locale.h"
 #elif defined(XP_MACOSX)
-#  include <Script.h>
 #  include <Carbon/Carbon.h>
 #  include "nsIMacLocale.h"
 #elif defined(XP_UNIX) || defined(XP_BEOS)
--- a/intl/uconv/src/nsMacCharset.cpp
+++ b/intl/uconv/src/nsMacCharset.cpp
@ -35,8 +35,7 @@
 *
 * ***** END LICENSE BLOCK ***** */

-#include <Script.h>
-#include <TextCommon.h>
+#include <Carbon/Carbon.h>
 #include "nsIPlatformCharset.h"
 #include "pratom.h"
 #include "nsGREResProperties.h"
--- a/media/liboggplay/src/liboggplay/Makefile.in
+++ b/media/liboggplay/src/liboggplay/Makefile.in
@ -69,3 +69,7 @@ CSRCS		= \
 		$(NULL)

 include $(topsrcdir)/config/rules.mk
+
+ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
+LOCAL_INCLUDES += -I$(MACOS_SDK_DIR)/Developer/Headers/FlatCarbon
+endif
--- a/modules/libreg/src/VerReg.c
+++ b/modules/libreg/src/VerReg.c
@ -77,7 +77,7 @@
 #include "VerReg.h"

 #if defined(XP_MACOSX)
-#include <Folders.h>
+#include <Carbon/Carbon.h>
 #endif

 /* -------- local defines --------------- 
--- a/modules/libreg/src/nr_bufio.c
+++ b/modules/libreg/src/nr_bufio.c
@ -52,8 +52,9 @@
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
-#if defined(XP_MAC) || defined(XP_MACOSX)
-  #include <Errors.h>
+
+#if defined(XP_MACOSX)
+#include <Carbon/Carbon.h>
 #endif

 #if defined(SUNOS4)
--- a/modules/libreg/src/vr_stubs.c
+++ b/modules/libreg/src/vr_stubs.c
@ -222,8 +222,7 @@ int FAR PASCAL _export WEP(int nParam)
 * ------------------------------------------------------------------
 */

-#if defined(XP_MAC) || defined(XP_MACOSX)
-#include <Files.h>
+#if defined(XP_MACOSX)

 #ifdef STANDALONE_REGISTRY
 extern XP_File vr_fileOpen(const char *name, const char * mode)
--- a/netwerk/base/src/nsURLHelperOSX.cpp
+++ b/netwerk/base/src/nsURLHelperOSX.cpp
@ -45,7 +45,7 @@
 #include "nsILocalFile.h"
 #include "nsTArray.h"
 #include "nsReadableUtils.h"
-#include <Files.h>
+#include <Carbon/Carbon.h>

 static nsTArray<nsCString> *gVolumeList = nsnull;

--- a/profile/dirserviceprovider/src/nsProfileLock.cpp
+++ b/profile/dirserviceprovider/src/nsProfileLock.cpp
@ -45,8 +45,8 @@
 #include "nsCOMPtr.h"

 #if defined(XP_MACOSX)
-#include <Processes.h>
-#include <CFBundle.h>
+#include <Carbon/Carbon.h>
+#include <CoreFoundation/CoreFoundation.h>
 #endif

 #ifdef XP_UNIX
--- a/toolkit/components/commandlines/src/nsCommandLine.cpp
+++ b/toolkit/components/commandlines/src/nsCommandLine.cpp
@ -57,7 +57,7 @@
 #include "plstr.h"

 #ifdef XP_MACOSX
-#include <CFURL.h>
+#include <CoreFoundation/CoreFoundation.h>
 #include "nsILocalFileMac.h"
 #elif defined(XP_WIN)
 #include <windows.h>
--- a/toolkit/profile/src/nsToolkitProfileService.cpp
+++ b/toolkit/profile/src/nsToolkitProfileService.cpp
@ -57,7 +57,7 @@
 #include "nsISimpleEnumerator.h"

 #ifdef XP_MACOSX
-#include <CFURL.h>
+#include <CoreFoundation/CoreFoundation.h>
 #include "nsILocalFileMac.h"
 #endif

--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@ -181,8 +181,7 @@
 #endif

 #if defined (XP_MACOSX)
-#include <Processes.h>
-#include <Events.h>
+#include <Carbon/Carbon.h>
 #endif

 #ifdef DEBUG
--- a/uriloader/exthandler/mac/nsInternetConfig.h
+++ b/uriloader/exthandler/mac/nsInternetConfig.h
@ -38,7 +38,7 @@
 #ifndef __NS_INTERNETCONFIG_H__
 #define __NS_INTERNETCONFIG_H__

-#include <InternetConfig.h>
+#include <Carbon/Carbon.h>
 #include "prtypes.h"
 #include "nsError.h"

--- a/uriloader/exthandler/mac/nsInternetConfig.mm
+++ b/uriloader/exthandler/mac/nsInternetConfig.mm
@ -41,7 +41,8 @@
 #include "nsReadableUtils.h"
 #include "nsDebug.h"

-#include <Processes.h>
+#include <Carbon/Carbon.h>
+
 ICInstance nsInternetConfig::sInstance = NULL;
 long nsInternetConfig::sSeed = 0;
 PRInt32  nsInternetConfig::sRefCount = 0;
--- a/uriloader/exthandler/nsIInternetConfigService.idl
+++ b/uriloader/exthandler/nsIInternetConfigService.idl
@ -42,7 +42,7 @@ interface nsIURL;

 %{C++

-#include <Files.h>
+#include <Carbon/Carbon.h>

 #define NS_INTERNETCONFIGSERVICE_CONTRACTID \
 "@mozilla.org/mac/internet-config-service;1"
--- a/widget/public/nsIPrintSessionX.idl
+++ b/widget/public/nsIPrintSessionX.idl
@ -39,7 +39,7 @@
 #include "nsIPrintSession.idl"

 %{ C++
-#include <PMApplication.h>
+#include <Carbon/Carbon.h>
 %}

 /**
--- a/widget/public/nsIPrintSettingsX.idl
+++ b/widget/public/nsIPrintSettingsX.idl
@ -40,7 +40,7 @@
 #include "nsISupports.idl"

 %{ C++
-#include <PMApplication.h>
+#include <Carbon/Carbon.h>
 %}

 /**
--- a/widget/src/cocoa/nsDeviceContextSpecX.h
+++ b/widget/src/cocoa/nsDeviceContextSpecX.h
@ -41,7 +41,7 @@

 #include "nsIDeviceContextSpec.h"

-#include <PMApplication.h>
+#include <Carbon/Carbon.h>

 class nsDeviceContextSpecX : public nsIDeviceContextSpec
 {
--- a/xpcom/glue/nsGREGlue.cpp
+++ b/xpcom/glue/nsGREGlue.cpp
@ -58,7 +58,7 @@
 # define INCL_DOS
 # include <os2.h>
 #elif defined(XP_MACOSX)
-# include <CFBundle.h>
+# include <CoreFoundation/CoreFoundation.h>
 # include <unistd.h>
 # include <dirent.h>
 #elif defined(XP_UNIX)
--- a/xpcom/io/SpecialSystemDirectory.h
+++ b/xpcom/io/SpecialSystemDirectory.h
@ -45,7 +45,7 @@
 #include "nsILocalFile.h"

 #ifdef XP_MACOSX
-#include <Types.h>
+#include <Carbon/Carbon.h>
 #include "nsILocalFileMac.h"
 #include "prenv.h"
 #endif
--- a/xpcom/io/nsAppFileLocationProvider.cpp
+++ b/xpcom/io/nsAppFileLocationProvider.cpp
@ -49,10 +49,7 @@
 #include "nsCRT.h"

 #if defined(XP_MACOSX)
-#include <Folders.h>
-#include <Script.h>
-#include <Processes.h>
-#include <Gestalt.h>
+#include <Carbon/Carbon.h>
 #include "nsILocalFileMac.h"
 #elif defined(XP_OS2)
 #define INCL_DOSPROCESS
--- a/xpcom/io/nsDirectoryService.cpp
+++ b/xpcom/io/nsDirectoryService.cpp
@ -63,13 +63,7 @@
 #include "prenv.h"
 #ifdef XP_MACOSX
 #include <CoreServices/CoreServices.h>
-#include <Folders.h>
-#include <Files.h>
-#include <Memory.h>
-#include <Processes.h>
-#include <Gestalt.h>
-#include <CFURL.h>
-#include <InternetConfig.h>
+#include <Carbon/Carbon.h>
 #endif
 #elif defined(XP_OS2)
 #define MAX_PATH _MAX_PATH
--- a/xpcom/io/nsILocalFileMac.idl
+++ b/xpcom/io/nsILocalFileMac.idl
@ -40,8 +40,8 @@
 #include "nsILocalFile.idl"

 %{C++
-#include <Files.h>
-#include <CFURL.h>
+#include <Carbon/Carbon.h>
+#include <CoreFoundation/CoreFoundation.h>
 %}

      native OSType(OSType);