diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-12-16 19:47:16 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-12-16 19:47:16 +0000 |
| commit | 6ed67789c50f7efe4a81cf851e166af51a97b549 (patch) | |
| tree | 0446c59842f0c7b8bbfee718a00f22f78dadfc0a /include/gpu | |
| parent | 477ed38504f69e29eb95b9ba0d5de0bcbc5e0281 (diff) | |
Updated GLintptr and GLsizeiptr to be the appropriate types on 64 bit Windows
BUG=326382
R=reed@google.com, bsalomon@google.com
Author: bajones@chromium.org
Review URL: https://codereview.chromium.org/111403003
git-svn-id: http://skia.googlecode.com/svn/trunk@12694 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include/gpu')
| -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 /////////////////////////////////////////////////////////////////////////////// |