Changed typedefs for GLintptr and GLsizeiptr (and ARB variants) to work around conflicts with Skia's typedefs in src/third_party/skia/include/gpu/gl/GrGLFunctions.h . There is a fundamental conflict between the OpenGL and OpenGL ES headers for these typedefs. Without this modification, src/ui/gl/gl_bindings_skia_in_process.cc fails to compile.
This patch is not appropriate to upstream to Mesa. Additionally, there may be a different workaround available which would allow this patch to be reverted.
BUG=238755
TBR=marcheu@chromium.org
Review URL: https://codereview.chromium.org/16818021
git-svn-id: svn://svn.chromium.org/chrome/trunk/deps/third_party/mesa@206312 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/include/GL/glext.h b/include/GL/glext.h
index 44ab7c6..357b4f2 100644
--- a/include/GL/glext.h
+++ b/include/GL/glext.h
@@ -6149,14 +6149,14 @@
#ifndef GL_VERSION_1_5
/* GL types for handling large vertex buffer objects */
-typedef ptrdiff_t GLintptr;
-typedef ptrdiff_t GLsizeiptr;
+typedef signed long int GLintptr;
+typedef signed long int GLsizeiptr;
#endif
#ifndef GL_ARB_vertex_buffer_object
/* GL types for handling large vertex buffer objects */
-typedef ptrdiff_t GLintptrARB;
-typedef ptrdiff_t GLsizeiptrARB;
+typedef signed long int GLintptrARB;
+typedef signed long int GLsizeiptrARB;
#endif
#ifndef GL_ARB_shader_objects
