diff options
| author |  halcanary <halcanary@google.com> | 2015-12-01 09:02:49 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-12-01 09:02:49 -0800 |
| commit | 0cbe7ee765cf72f15e6ca10b308676aa077fb3e2 (patch) | |
| tree | fb6c06bbf5b34e9bc72cb5b659ccd8ce46de3700 /include/core/SkPreConfig.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/core/SkPreConfig.h')
| -rw-r--r-- | include/core/SkPreConfig.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/core/SkPreConfig.h b/include/core/SkPreConfig.h index 0c720010f7..a1a3037b94 100644 --- a/include/core/SkPreConfig.h +++ b/include/core/SkPreConfig.h @@ -28,9 +28,9 @@ #define SK_BUILD_FOR_WIN32 #elif defined(ANDROID) #define SK_BUILD_FOR_ANDROID - #elif defined(linux) || defined(__FreeBSD__) || defined(__OpenBSD__) || \ - defined(__sun) || defined(__NetBSD__) || defined(__DragonFly__) || \ - defined(__GLIBC__) || defined(__GNU__) + #elif defined(linux) || defined(__linux) || defined(__FreeBSD__) || \ + defined(__OpenBSD__) || defined(__sun) || defined(__NetBSD__) || \ + defined(__DragonFly__) || defined(__GLIBC__) || defined(__GNU__) #define SK_BUILD_FOR_UNIX #elif TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR #define SK_BUILD_FOR_IOS |