aboutsummaryrefslogtreecommitdiffhomepage
path: root/include
diff options
context:
space:
mode:
authorGravatar commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2014-05-04 00:46:50 +0000
committerGravatar commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2014-05-04 00:46:50 +0000
commitf8a8ae1322e55d37b3b4b0e25d56f72ab2ee5c09 (patch)
treec54e4942fa61404ea5323da15973cb2fb329e3f2 /include
parent09d2dcdfc9b9b3b04d003f9a3c932509a58dbdcf (diff)
eliminate mac xcode 5 only warning
on os x 10.9.2 unistd.h defines sysconf as long sysconf(int); R=mtklein@google.com, reed@google.com Author: caryclark@google.com Review URL: https://codereview.chromium.org/261673004 git-svn-id: http://skia.googlecode.com/svn/trunk@14559 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include')
-rw-r--r--include/utils/SkThreadPool.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/utils/SkThreadPool.h b/include/utils/SkThreadPool.h
index 295b1b4f08..c99c5c4188 100644
--- a/include/utils/SkThreadPool.h
+++ b/include/utils/SkThreadPool.h
@@ -26,7 +26,7 @@ static inline int num_cores() {
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