diff options
author | Thiago Macieira <thiago.macieira@intel.com> | 2014-12-18 14:52:04 -0800 |
---|---|---|
committer | Thiago Macieira <thiago.macieira@intel.com> | 2014-12-20 07:38:29 +0100 |
commit | 99357e32a0e29c73ed721d6d31da66635e6586ca (patch) | |
tree | 4d3e20480ce6c2411875541690e507aef7622832 /src/corelib/global/qglobal.h | |
parent | 045fc1db757377771bba5c8f5c6429bbd02f441a (diff) |
Fix detection of C++11 Unicode strings with icl.exe
Even though the compiler supports it, the MSVC headers might do
something wrong and make compilation fail later due to attempting to
overload unsigned short with char16_t.
The _CHAR16_T definition comes from <cstddef>, so include that instead
of <stddef.h> in C++ mode.
Change-Id: Ifaeb1c92bde2db4ed4129507462391904afd6510
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Diffstat (limited to 'src/corelib/global/qglobal.h')
-rw-r--r-- | src/corelib/global/qglobal.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 19e368defc..e93bfbcc4a 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -35,7 +35,11 @@ #ifndef QGLOBAL_H #define QGLOBAL_H -#include <stddef.h> +#ifdef __cplusplus +# include <cstddef> +#else +# include <stddef.h> +#endif #define QT_VERSION_STR "5.5.0" /* |