diff options
| author |  robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-12-18 23:56:59 +0000 |
|---|---|---|
| committer | robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-12-18 23:56:59 +0000 |
| commit | 01a2f1cbadae340b29f19538e9f9fb6e62e0bc8b (patch) | |
| tree | a6a678516855ded0987eef52801e2a6442684a8d /include | |
| parent | 7e5d24c22eaa78d016ed1b1c898cde204608e471 (diff) | |
Revert r12758 (Updated GLintptr and GLsizeiptr to be the appropriate types on 64 bit Windows (Take 2) - https://codereview.chromium.org/118533003) due to Chromium-side compilation issues
git-svn-id: http://skia.googlecode.com/svn/trunk@12762 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include')
| -rw-r--r-- | include/gpu/gl/GrGLFunctions.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/include/gpu/gl/GrGLFunctions.h b/include/gpu/gl/GrGLFunctions.h index a8b48ca868..7417685b28 100644 --- a/include/gpu/gl/GrGLFunctions.h +++ b/include/gpu/gl/GrGLFunctions.h @@ -35,13 +35,8 @@ typedef float GrGLclampf; typedef double GrGLdouble; typedef double GrGLclampd; typedef void GrGLvoid; -#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 +typedef long GrGLintptr; +typedef long GrGLsizeiptr; /////////////////////////////////////////////////////////////////////////////// |