diff options
author | 2015-12-01 09:02:49 -0800 | |
---|---|---|
committer | 2015-12-01 09:02:49 -0800 | |
commit | 0cbe7ee765cf72f15e6ca10b308676aa077fb3e2 (patch) | |
tree | fb6c06bbf5b34e9bc72cb5b659ccd8ce46de3700 /include/ports/SkTypeface_mac.h | |
parent | 9323dc6a72de301f23e1187adc2365395b4b23d8 (diff) |
CMake, include/: changes to make fiddle 2.0 better
cmake: remove unused directories from skia.h / ${public_includes}
SkPreConfig.h: work around buggy `#ifdef linux`
include: guard many platform-specific headers
CQ_EXTRA_TRYBOTS=client.skia.compile:Build-Ubuntu-GCC-x86_64-Release-CMake-Trybot,Build-Mac10.9-Clang-x86_64-Release-CMake-Trybot
Review URL: https://codereview.chromium.org/1488813002
Diffstat (limited to 'include/ports/SkTypeface_mac.h')
-rw-r--r-- | include/ports/SkTypeface_mac.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/ports/SkTypeface_mac.h b/include/ports/SkTypeface_mac.h index 59bf77b106..14440b5383 100644 --- a/include/ports/SkTypeface_mac.h +++ b/include/ports/SkTypeface_mac.h @@ -10,6 +10,8 @@ #include "SkTypeface.h" +#if defined(SK_BUILD_FOR_MAC) || defined(SK_BUILD_FOR_IOS) + #include <CoreFoundation/CoreFoundation.h> #ifdef SK_BUILD_FOR_MAC @@ -43,4 +45,5 @@ SK_API extern SkTypeface* SkCreateTypefaceFromCTFont(CTFontRef, CFTypeRef = NULL */ SK_API extern CTFontRef SkTypeface_GetCTFontRef(const SkTypeface* face); -#endif +#endif // defined(SK_BUILD_FOR_MAC) || defined(SK_BUILD_FOR_IOS) +#endif // SkTypeface_mac_DEFINED |