commit 8601dbc0a249422397d70d700f7c4ddc2a1631df
author Android Chromium Automerger <chromium-automerger@android> Sat Jan 04 14:21:20 2014 +0000
committer Android Chromium Automerger <chromium-automerger@android> Sat Jan 04 14:21:20 2014 +0000
tree 7c93ad0519951563f811c6b0b22089c2160af4ea
parent 4980a6cd48688c360a8c584d07405efb3cfe1fcf
parent ff34f1e559362fbff2c693ed16effb3046dba8e9

Merge third_party/mesa/src from https://chromium.googlesource.com/chromium/deps/mesa.git at ff34f1e559362fbff2c693ed16effb3046dba8e9

This commit was generated by merge_from_chromium.py.

Change-Id: I19399967c7fa96ed70d371e13b877bfa4cc68108

include/GL/glext.h

diff --git a/include/GL/glext.h b/include/GL/glext.h
index 357b4f2..cb19ed4 100644
--- a/include/GL/glext.h
+++ b/include/GL/glext.h
@@ -6149,14 +6149,24 @@
 
 #ifndef GL_VERSION_1_5
 /* GL types for handling large vertex buffer objects */
-typedef signed long int GLintptr;
-typedef signed long int GLsizeiptr;
+#ifdef _WIN64
+typedef signed   long long int GLintptr;
+typedef signed   long long int GLsizeiptr;
+#else
+typedef signed   long  int     GLintptr;
+typedef signed   long  int     GLsizeiptr;
+#endif
 #endif
 
 #ifndef GL_ARB_vertex_buffer_object
 /* GL types for handling large vertex buffer objects */
-typedef signed long int GLintptrARB;
-typedef signed long int GLsizeiptrARB;
+#ifdef _WIN64
+typedef signed   long long int GLintptrARB;
+typedef signed   long long int GLsizeiptrARB;
+#else
+typedef signed   long  int     GLintptrARB;
+typedef signed   long  int     GLsizeiptrARB;
+#endif
 #endif
 
 #ifndef GL_ARB_shader_objects