diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-01-04 14:21:20 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-01-04 14:21:20 +0000 |
| commit | 8601dbc0a249422397d70d700f7c4ddc2a1631df (patch) | |
| tree | 7c93ad0519951563f811c6b0b22089c2160af4ea | |
| parent | 4980a6cd48688c360a8c584d07405efb3cfe1fcf (diff) | |
| parent | ff34f1e559362fbff2c693ed16effb3046dba8e9 (diff) | |
| download | src-8601dbc0a249422397d70d700f7c4ddc2a1631df.tar.gz | |
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
| -rw-r--r-- | include/GL/glext.h | 18 |
1 files changed, 14 insertions, 4 deletions
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 @@ typedef char GLchar; #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 |