From 9ae7e33f28f972ec566d62ab110e173ebe933520 Mon Sep 17 00:00:00 2001 From: Laszlo Agocs Date: Thu, 23 Apr 2015 17:55:39 +0200 Subject: Use stdint.h in qopengl headers on MSVC too Task-number: QTBUG-45774 Change-Id: I1505b4ebeb99371ec2099657c9ce05418dd54224 Reviewed-by: Friedemann Kleint Reviewed-by: Sean Harmer --- src/gui/opengl/qopengl.h | 2 +- src/gui/opengl/qopenglext.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/gui/opengl') diff --git a/src/gui/opengl/qopengl.h b/src/gui/opengl/qopengl.h index a70bd79997..72abce760d 100644 --- a/src/gui/opengl/qopengl.h +++ b/src/gui/opengl/qopengl.h @@ -221,7 +221,7 @@ typedef unsigned long long int uint64_t; typedef long int int32_t; typedef long long int int64_t; typedef unsigned long long int uint64_t; -#elif defined(_WIN32) && defined(__GNUC__) +#elif defined(_WIN32) && (defined(__GNUC__) || (defined(_MSC_VER) && _MSC_VER >= 1600)) #include #elif defined(_WIN32) typedef __int32 int32_t; diff --git a/src/gui/opengl/qopenglext.h b/src/gui/opengl/qopenglext.h index 36bad4ce28..72316ca496 100644 --- a/src/gui/opengl/qopenglext.h +++ b/src/gui/opengl/qopenglext.h @@ -1399,7 +1399,7 @@ typedef unsigned long long int uint64_t; typedef long int int32_t; typedef long long int int64_t; typedef unsigned long long int uint64_t; -#elif defined(_WIN32) && defined(__GNUC__) +#elif defined(_WIN32) && (defined(__GNUC__) || (defined(_MSC_VER) && _MSC_VER >= 1600)) #include #elif defined(_WIN32) typedef __int32 int32_t; -- cgit v1.2.3