diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-11-15 10:49:47 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-11-15 15:39:44 +0000 |
| commit | dc0111b2a75eebf2535df894b66ef8d1a1ba57e0 (patch) | |
| tree | ec361eac787342b6e2e2529bec001183e14f5199 /src | |
| parent | aa7ad517c793e71e7e4e1aafce04cdb8c651f0f6 (diff) | |
Change qopenglext to match official Khronos headers
Otherwise we can hit issues when other versions are included, as
ptrdiff_t while having the same length is not the same type as signed
long long on MSVC.
Change-Id: Id42049b1052e528a663125ee5426b068ee46db72
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/opengl/qopenglext.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/gui/opengl/qopenglext.h b/src/gui/opengl/qopenglext.h index 856adb679e..63873476e4 100644 --- a/src/gui/opengl/qopenglext.h +++ b/src/gui/opengl/qopenglext.h @@ -468,9 +468,14 @@ GLAPI void APIENTRY glBlendEquation (GLenum mode); #ifndef GL_VERSION_1_5 #define GL_VERSION_1_5 1 -#include <stddef.h> -typedef ptrdiff_t GLsizeiptr; -typedef ptrdiff_t GLintptr; +#ifdef _WIN64 +typedef signed long long int GLsizeiptr; +typedef signed long long int GLintptr; +#else +typedef signed long int GLsizeiptr; +typedef signed long int GLintptr; +#endif + #define GL_BUFFER_SIZE 0x8764 #define GL_BUFFER_USAGE 0x8765 #define GL_QUERY_COUNTER_BITS 0x8864 |