diff options
| author |  yangsu@google.com <yangsu@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-06-21 13:09:32 +0000 |
|---|---|---|
| committer | yangsu@google.com <yangsu@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-06-21 13:09:32 +0000 |
| commit | ccb74eabccf19f66b6bf31f4acae89b62baa16c3 (patch) | |
| tree | 3b139651321fff4d9646c5adcee031da2abc90be /include/ports/SkTypeface_mac.h | |
| parent | 2d54d06adc58f0a6372fb2a1b2eca832965b863c (diff) | |
Changed mac specific files to use ApplicationServices rather than Carbon
http://codereview.appspot.com/4644053/
git-svn-id: http://skia.googlecode.com/svn/trunk@1658 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include/ports/SkTypeface_mac.h')
| -rw-r--r-- | include/ports/SkTypeface_mac.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/ports/SkTypeface_mac.h b/include/ports/SkTypeface_mac.h index 61b226bbc2..8f8af50747 100644 --- a/include/ports/SkTypeface_mac.h +++ b/include/ports/SkTypeface_mac.h @@ -19,8 +19,13 @@ #define SkTypeface_mac_DEFINED #include "SkTypeface.h" -#include <Carbon/Carbon.h> +#ifdef SK_BUILD_FOR_MAC +#import <ApplicationServices/ApplicationServices.h> +#endif +#ifdef SK_BUILD_FOR_IOS +#include <CoreText/CoreText.h> +#endif /** * Like the other Typeface create methods, this returns a new reference to the * corresponding typeface for the specified CTFontRef. The caller must call |