diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/tools/qdatetime.h | 9 | ||||
| -rw-r--r-- | src/network/socket/qnativesocketengine_win.cpp | 3 | ||||
| -rw-r--r-- | src/plugins/platforms/windows/accessible/comutils.cpp | 3 |
3 files changed, 6 insertions, 9 deletions
diff --git a/src/corelib/tools/qdatetime.h b/src/corelib/tools/qdatetime.h index af257eaa40..a648285e89 100644 --- a/src/corelib/tools/qdatetime.h +++ b/src/corelib/tools/qdatetime.h @@ -46,15 +46,6 @@ #include <QtCore/qnamespace.h> #include <QtCore/qsharedpointer.h> -// windows.h defines these identifiers, so undefine it -// ### figure out where in Qt we include it too soon -#ifdef max -# undef max -#endif -#ifdef min -# undef min -#endif - #include <limits> QT_BEGIN_HEADER diff --git a/src/network/socket/qnativesocketengine_win.cpp b/src/network/socket/qnativesocketengine_win.cpp index bc26a7f9c2..60c4c73950 100644 --- a/src/network/socket/qnativesocketengine_win.cpp +++ b/src/network/socket/qnativesocketengine_win.cpp @@ -39,6 +39,9 @@ ** ****************************************************************************/ +// Prevent windows system header files from defining min/max as macros. +#define NOMINMAX + #include <winsock2.h> #include <ws2tcpip.h> diff --git a/src/plugins/platforms/windows/accessible/comutils.cpp b/src/plugins/platforms/windows/accessible/comutils.cpp index 2823306609..05227c9e51 100644 --- a/src/plugins/platforms/windows/accessible/comutils.cpp +++ b/src/plugins/platforms/windows/accessible/comutils.cpp @@ -38,6 +38,9 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ + +#include <qt_windows.h> + #include <ocidl.h> #include <olectl.h> |