| commit | 31114ce34327413a289f96f9e9572e0413f3c225 | [log] [tgz] |
|---|---|---|
| author | Android Chromium Automerger <chromium-automerger@android> | Mon May 05 09:37:36 2014 +0000 |
| committer | Android Chromium Automerger <chromium-automerger@android> | Mon May 05 09:37:36 2014 +0000 |
| tree | 1e9281525b6840316aa65adde0fe07cc93c774c2 | |
| parent | 27369891df5b567113ad1f28e5044a9b414a810b [diff] | |
| parent | 408cb61cd625026f204980897f638ed6ba3cf3e8 [diff] |
Merge third_party/skia/include from https://chromium.googlesource.com/external/skia/include.git at 408cb61cd625026f204980897f638ed6ba3cf3e8 This commit was generated by merge_from_chromium.py. Change-Id: I257aa35320638c9cd19f88b14623b08774d5a2b5
diff --git a/utils/SkThreadPool.h b/utils/SkThreadPool.h index 295b1b4..c99c5c4 100644 --- a/utils/SkThreadPool.h +++ b/utils/SkThreadPool.h
@@ -26,7 +26,7 @@ GetSystemInfo(&sysinfo); return sysinfo.dwNumberOfProcessors; #elif defined(SK_BUILD_FOR_UNIX) || defined(SK_BUILD_FOR_MAC) || defined(SK_BUILD_FOR_ANDROID) - return sysconf(_SC_NPROCESSORS_ONLN); + return (int) sysconf(_SC_NPROCESSORS_ONLN); #else return 1; #endif