gistfile1

diff --git a/chromium/gpu/command_buffer/common/gles2_cmd_format.h b/chromium/gpu/command_buffer/common/gles2_cmd_format.h
index 04a3dc3..03029d2 100644
--- a/chromium/gpu/command_buffer/common/gles2_cmd_format.h
+++ b/chromium/gpu/command_buffer/common/gles2_cmd_format.h
@@ -40,6 +40,8 @@ typedef double GLdouble;
 typedef double GLclampd;
 typedef void GLvoid;
 
+#ifndef GLEXT_PTR_TYPES_DEFINED
+#define GLEXT_PTR_TYPES_DEFINED 1
 #ifdef _WIN64
 typedef signed long long int GLintptr;
 typedef signed long long int GLsizeiptr;
@@ -47,6 +49,7 @@ typedef signed long long int GLsizeiptr;
 typedef khronos_intptr_t GLintptr;
 typedef khronos_ssize_t  GLsizeiptr;
 #endif
+#endif
 
 namespace gpu {
 namespace gles2 {
diff --git a/chromium/third_party/mesa/src/include/GL/glext.h b/chromium/third_party/mesa/src/include/GL/glext.h
index cb19ed4..050455b 100644
--- a/chromium/third_party/mesa/src/include/GL/glext.h
+++ b/chromium/third_party/mesa/src/include/GL/glext.h
@@ -6148,6 +6148,8 @@ typedef char GLchar;
 #endif
 
 #ifndef GL_VERSION_1_5
+#ifndef GLEXT_PTR_TYPES_DEFINED
+#define GLEXT_PTR_TYPES_DEFINED 1
 /* GL types for handling large vertex buffer objects */
 #ifdef _WIN64
 typedef signed   long long int GLintptr;
@@ -6157,6 +6159,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 */