From 0ef335ac8118ab68b3a282dc89b8dc70476ea1b7 Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Wed, 18 Dec 2013 21:09:21 +0000 Subject: 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 --- include/gpu/gl/GrGLFunctions.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'include/gpu/gl/GrGLFunctions.h') 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 /////////////////////////////////////////////////////////////////////////////// -- cgit v1.2.3