diff options
| author | Michael Brüning <michael.bruning@digia.com> | 2014-10-01 17:15:54 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-05-10 16:11:53 +0200 |
| commit | 669b25be7fc1b730d72d3caec2d7d15a0a19ecdd (patch) | |
| tree | cc575df951a12b7051223c89b062c48b6b5e9844 | |
| parent | 7eca26d7b005fcb05a4941709d6023af46c20b2a (diff) | |
| download | qtwebengine-chromium-669b25be7fc1b730d72d3caec2d7d15a0a19ecdd.tar.gz | |
<chromium> Fix conflicting types for 64 bit Windows Desktop GL.
Fixes the redefinition of pointer types to appropriate values
on 64 Bit Windows.
Change-Id: Ia1735a5ae5c9dc12dab80e7670dea8270ebf089f
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
| -rw-r--r-- | chromium/gpu/command_buffer/common/gles2_cmd_format.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/chromium/gpu/command_buffer/common/gles2_cmd_format.h b/chromium/gpu/command_buffer/common/gles2_cmd_format.h index e9483825e4f..20513f5138f 100644 --- a/chromium/gpu/command_buffer/common/gles2_cmd_format.h +++ b/chromium/gpu/command_buffer/common/gles2_cmd_format.h @@ -42,8 +42,14 @@ typedef float GLclampf; typedef double GLdouble; typedef double GLclampd; typedef void GLvoid; + +#ifdef _WIN64 +typedef signed long long int GLintptr; +typedef signed long long int GLsizeiptr; +#else typedef khronos_intptr_t GLintptr; typedef khronos_ssize_t GLsizeiptr; +#endif typedef struct __GLsync *GLsync; typedef int64_t GLint64; typedef uint64_t GLuint64; |