diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-02-21 12:17:48 +0000 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2014-02-21 12:17:48 +0000 |
| commit | 23aa870c9ceb79d1ea99e9c5a348b43d5e02c1b5 (patch) | |
| tree | 7c93ad0519951563f811c6b0b22089c2160af4ea | |
| parent | 638e9ad8cc1ec1c1fcd9caeb26be9daec073cfac (diff) | |
| parent | 8601dbc0a249422397d70d700f7c4ddc2a1631df (diff) | |
| download | src-23aa870c9ceb79d1ea99e9c5a348b43d5e02c1b5.tar.gz | |
Merge from Chromium at DEPS revision 251904
This commit was generated by merge_to_master.py.
Change-Id: I3b9f02c0ee2ab503ae4d1ca14306c7da459ab628
| -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 |