Bug 482277 - stop using FlatCarbon headers on Mac OS X; (Cv1-CC) Port this to comm-central too.
authorSerge Gautherie <sgautherie.bz@free.fr>
Mon, 29 Mar 2010 19:42:17 +0200
changeset 5316 867fb51b75d88228d17d79b60c48883ece6d38e1
parent 5315 1491c416905722c9f07aebc171b9e279a2393a6f
child 5317 d64392a6e23fdae02e9f6392de3b863a7aa21739
push idunknown
push userunknown
push dateunknown
bugs482277
Bug 482277 - stop using FlatCarbon headers on Mac OS X; (Cv1-CC) Port this to comm-central too. r+sr=standard8.
configure.in
mailnews/compose/src/nsMsgAppleEncode.cpp
--- a/configure.in
+++ b/configure.in
@@ -4860,17 +4860,16 @@ cairo-cocoa)
     AC_DEFINE(XP_MACOSX)
     AC_DEFINE(TARGET_CARBON)
     AC_DEFINE(TARGET_API_MAC_CARBON)
     if test "$MOZILLA_1_9_2_BRANCH" = "1"; then
     TK_LIBS='-framework Carbon -framework AddressBook'
     else
     TK_LIBS='-framework QuartzCore -framework Carbon -framework AddressBook'
     fi
-    TK_CFLAGS="-I${MACOS_SDK_DIR}/Developer/Headers/FlatCarbon"
     CFLAGS="$CFLAGS $TK_CFLAGS"
     CXXFLAGS="$CXXFLAGS $TK_CFLAGS"
     ;;
 esac
 
 if test "$COMPILE_ENVIRONMENT"; then
   if test "$MOZ_ENABLE_GTK2"; then
     if test "$MOZ_X11"; then
--- a/mailnews/compose/src/nsMsgAppleEncode.cpp
+++ b/mailnews/compose/src/nsMsgAppleEncode.cpp
@@ -52,17 +52,17 @@
 #include "nsMimeTypes.h"
 #include "prprf.h"
 #include "nsServiceManagerUtils.h"
 #include "nsMsgAppleDouble.h"
 #include "nsMsgAppleCodes.h"
 
 #ifdef XP_MACOSX
 
-#include <Errors.h>
+#include <Carbon/Carbon.h>
 
 /*
 **	Local Functions prototypes.
 */
 static int output64chunk( appledouble_encode_object* p_ap_encode_obj, 
 				int c1, int c2, int c3, int pads);
 				
 static int to64(appledouble_encode_object* p_ap_encode_obj,