diff options
| author | bajones@chromium.org <bajones@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-16 18:37:00 +0000 |
|---|---|---|
| committer | bajones@chromium.org <bajones@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-16 18:37:00 +0000 |
| commit | ff34f1e559362fbff2c693ed16effb3046dba8e9 (patch) | |
| tree | 7c93ad0519951563f811c6b0b22089c2160af4ea | |
| parent | e740c825b11773ebe636675977e5f79de253c745 (diff) | |
| download | src-ff34f1e559362fbff2c693ed16effb3046dba8e9.tar.gz | |
Updated GLintptr and GLsizeiptr to be the appropriate types on 64 bit Windows
BUG=326382
TBR=kbr@chromium.org
Review URL: https://codereview.chromium.org/108043006
git-svn-id: svn://svn.chromium.org/chrome/trunk/deps/third_party/mesa@240938 0039d316-1c4b-4281-b951-d872f2087c98
| -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 |