include/gpu/gl/GrGLFunctions.h - Issue 118533003: Updated GLintptr and GLsizeiptr to be the appropriate types on 64 bit Windows (Take 2)

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: include/gpu/gl/GrGLFunctions.h

Issue 118533003: Updated GLintptr and GLsizeiptr to be the appropriate types on 64 bit Windows (Take 2) (Closed) Base URL: http://skia.googlecode.com/svn/trunk/

Patch Set: Put change behind a flag Created 7 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: include/gpu/gl/GrGLFunctions.h

===================================================================

--- include/gpu/gl/GrGLFunctions.h (revision 12777)

+++ include/gpu/gl/GrGLFunctions.h (working copy)

@@ -35,8 +35,18 @@

typedef double GrGLdouble;

typedef double GrGLclampd;

typedef void GrGLvoid;

-typedef long GrGLintptr;

-typedef long GrGLsizeiptr;

+#ifndef SK_IGNORE_64BIT_OPENGL_CHANGES

+#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

+#else

+typedef signed long int GrGLintptr;

+typedef signed long int GrGLsizeiptr;

+#endif

///////////////////////////////////////////////////////////////////////////////

« no previous file with comments | « no previous file | no next file » | no next file with comments »