From 01a2f1cbadae340b29f19538e9f9fb6e62e0bc8b Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Wed, 18 Dec 2013 23:56:59 +0000 Subject: [PATCH] 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 --- include/gpu/gl/GrGLFunctions.h | 9 ++------- 1 file 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; ///////////////////////////////////////////////////////////////////////////////