diff options
author | 2013-12-20 14:24:21 +0000 | |
---|---|---|
committer | 2013-12-20 14:24:21 +0000 | |
commit | 01c41a556e0ef0ae2338a1b5ae110a501e1ed0a8 (patch) | |
tree | 161c3eeed7af2413719cd04c5cb9a627ffcc2537 /include/core/SkPostConfig.h | |
parent | 5f2fd5dd5d6dbf3057258d652aacfc9d664132a2 (diff) |
Revert "Revert "begin to remove SkLONGLONG and wean Skia off of Sk64""
This reverts commit 15b986baf026a3da5e2cac8106a1b753df242c39.
BUG=
Review URL: https://codereview.chromium.org/119353003
git-svn-id: http://skia.googlecode.com/svn/trunk@12796 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include/core/SkPostConfig.h')
-rw-r--r-- | include/core/SkPostConfig.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/core/SkPostConfig.h b/include/core/SkPostConfig.h index 323d1e8b6d..2156519b2d 100644 --- a/include/core/SkPostConfig.h +++ b/include/core/SkPostConfig.h @@ -227,13 +227,13 @@ ////////////////////////////////////////////////////////////////////// +// TODO: rebaseline as needed so we can remove this flag entirely. +// - all platforms have int64_t now +// - we have slightly different fixed math results because of this check +// since we don't define this for linux/android #if defined(SK_BUILD_FOR_WIN32) || defined(SK_BUILD_FOR_MAC) # ifndef SkLONGLONG -# ifdef SK_BUILD_FOR_WIN32 -# define SkLONGLONG __int64 -# else -# define SkLONGLONG long long -# endif +# define SkLONGLONG int64_t # endif #endif |