Created
March 11, 2015 12:36
-
-
Save bbandix/d9516247d8ae071e58a7 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/chromium/third_party/mesa/src/include/GL/glext.h b/chromium/third_party/mesa/src/include/GL/glext.h | |
index cb19ed4..a2ef5c2 100644 | |
--- a/chromium/third_party/mesa/src/include/GL/glext.h | |
+++ b/chromium/third_party/mesa/src/include/GL/glext.h | |
@@ -6148,6 +6148,7 @@ typedef char GLchar; | |
#endif | |
#ifndef GL_VERSION_1_5 | |
+#if !defined(TOOLKIT_QT) | |
/* GL types for handling large vertex buffer objects */ | |
#ifdef _WIN64 | |
typedef signed long long int GLintptr; | |
@@ -6157,6 +6158,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 */ |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment