gistfile1

diff --git a/chromium/third_party/mesa/src/include/GL/glext.h b/chromium/third_party/mesa/src/include/GL/glext.h
index cb19ed4..87efe91 100644
--- a/chromium/third_party/mesa/src/include/GL/glext.h
+++ b/chromium/third_party/mesa/src/include/GL/glext.h
@@ -6148,6 +6148,7 @@ typedef char GLchar;
 #endif
 
 #ifndef GL_VERSION_1_5
+#if !defined(BUILDING_CHROMIUM)
 /* GL types for handling large vertex buffer objects */
 #ifdef _WIN64
 typedef signed   long long int GLintptr;
@@ -6157,6 +6158,7 @@ typedef signed   long  int     GLintptr;
 typedef signed   long  int     GLsizeiptr;
 #endif
 #endif
+#endif
 
 #ifndef GL_ARB_vertex_buffer_object
 /* GL types for handling large vertex buffer objects */