From dc0111b2a75eebf2535df894b66ef8d1a1ba57e0 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Thu, 15 Nov 2018 10:49:47 +0100 Subject: Change qopenglext to match official Khronos headers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Laszlo Agocs --- src/gui/opengl/qopenglext.h | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'src/gui/opengl/qopenglext.h') 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 -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 -- cgit v1.2.3