Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(459)

Unified Diff: third_party/mesa/include/GL/glext.h

Issue 16818021: Changed typedefs for GLintptr and GLsizeiptr (and ARB variants) to work around conflicts with Skia'… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/
Patch Set: Created 7 years, 6 months 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/mesa/include/GL/glext.h
===================================================================
--- third_party/mesa/include/GL/glext.h (revision 206309)
+++ third_party/mesa/include/GL/glext.h (working copy)
@@ -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
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698