diff options
author | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2015-04-23 17:55:39 +0200 |
---|---|---|
committer | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2015-05-02 11:38:32 +0000 |
commit | 9ae7e33f28f972ec566d62ab110e173ebe933520 (patch) | |
tree | ff6e5c83b559459eb583a225ebccede2486abaed | |
parent | 36919ef1bd4b7e1efd0e9d66ab574700427386b1 (diff) |
Use stdint.h in qopengl headers on MSVC toov5.5.0-beta1
Task-number: QTBUG-45774
Change-Id: I1505b4ebeb99371ec2099657c9ce05418dd54224
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
-rw-r--r-- | src/gui/opengl/qopengl.h | 2 | ||||
-rw-r--r-- | src/gui/opengl/qopenglext.h | 2 |
2 files changed, 2 insertions, 2 deletions
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 <stdint.h> #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 <stdint.h> #elif defined(_WIN32) typedef __int32 int32_t; |