diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-12-18 21:09:21 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-12-18 21:09:21 +0000 |
| commit | 0ef335ac8118ab68b3a282dc89b8dc70476ea1b7 (patch) | |
| tree | 12d0d42b84fcc91d083b28e9c5eb2227ab2b92ec /include/gpu/gl | |
| parent | 98000efa59ef82eaee8df04e4dd0c328439719a7 (diff) | |
Updated GLintptr and GLsizeiptr to be the appropriate types on 64 bit Windows (Take 2)
Requires changes from https://codereview.chromium.org/99053007/ before this can be rolled in Chromium DEPS. If this begins breaking the build due to an early roll, please contact bajones@chromium.org before reverting.
BUG=326382
R=bsalomon@chromium.org
TBR=bsalomon@chromium.org
Author: bajones@chromium.org
Review URL: https://codereview.chromium.org/118533003
git-svn-id: http://skia.googlecode.com/svn/trunk@12758 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include/gpu/gl')
| -rw-r--r-- | include/gpu/gl/GrGLFunctions.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/include/gpu/gl/GrGLFunctions.h b/include/gpu/gl/GrGLFunctions.h index 7417685b28..a8b48ca868 100644 --- a/include/gpu/gl/GrGLFunctions.h +++ b/include/gpu/gl/GrGLFunctions.h @@ -35,8 +35,13 @@ typedef float GrGLclampf; typedef double GrGLdouble; typedef double GrGLclampd; typedef void GrGLvoid; -typedef long GrGLintptr; -typedef long GrGLsizeiptr; +#ifdef _WIN64 +typedef signed long long int GrGLintptr; +typedef signed long long int GrGLsizeiptr; +#else +typedef signed long int GrGLintptr; +typedef signed long int GrGLsizeiptr; +#endif /////////////////////////////////////////////////////////////////////////////// |