From 16fd2cbb931bba56ec6bbda8567ea20aa324d18b Mon Sep 17 00:00:00 2001 From: Kai Koehne <kai.koehne@digia.com> Date: Wed, 24 Apr 2013 09:39:53 +0200 Subject: [PATCH] MinGW: Fix warning about _WIN32_WINNT being redefined Change-Id: Ia097316b1eb16fbb0868f8b3f42e0ad5892f4573 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> --- src/libs/utils/winutils.cpp | 1 + src/plugins/debugger/procinterrupt.cpp | 1 + src/plugins/debugger/shared/hostutils.cpp | 1 + src/plugins/projectexplorer/devicesupport/localprocesslist.cpp | 1 + 4 files changed, 4 insertions(+) diff --git a/src/libs/utils/winutils.cpp b/src/libs/utils/winutils.cpp index 169128f9c59..01ed4d2a0c9 100644 --- a/src/libs/utils/winutils.cpp +++ b/src/libs/utils/winutils.cpp @@ -31,6 +31,7 @@ #include "qtcassert.h" // Enable WinAPI Windows XP and later +#undef _WIN32_WINNT #define _WIN32_WINNT 0x0501 #include <windows.h> diff --git a/src/plugins/debugger/procinterrupt.cpp b/src/plugins/debugger/procinterrupt.cpp index 9530fc0e2f3..e93b3260146 100644 --- a/src/plugins/debugger/procinterrupt.cpp +++ b/src/plugins/debugger/procinterrupt.cpp @@ -43,6 +43,7 @@ static inline QString msgCannotInterrupt(int pid, const QString &why) #if defined(Q_OS_WIN) +#undef _WIN32_WINNT #define _WIN32_WINNT 0x0501 /* WinXP, needed for DebugBreakProcess() */ #include <utils/winutils.h> diff --git a/src/plugins/debugger/shared/hostutils.cpp b/src/plugins/debugger/shared/hostutils.cpp index a44efb0ef24..bd28580f995 100644 --- a/src/plugins/debugger/shared/hostutils.cpp +++ b/src/plugins/debugger/shared/hostutils.cpp @@ -34,6 +34,7 @@ #include <QTextStream> // Enable Win API of XP SP1 and later +#undef _WIN32_WINNT #define _WIN32_WINNT 0x0502 #include <windows.h> #include <utils/winutils.h> diff --git a/src/plugins/projectexplorer/devicesupport/localprocesslist.cpp b/src/plugins/projectexplorer/devicesupport/localprocesslist.cpp index 7cb9dc6f8c5..5670399a35d 100644 --- a/src/plugins/projectexplorer/devicesupport/localprocesslist.cpp +++ b/src/plugins/projectexplorer/devicesupport/localprocesslist.cpp @@ -45,6 +45,7 @@ #ifdef Q_OS_WIN // Enable Win API of XP SP1 and later +#undef _WIN32_WINNT #define _WIN32_WINNT 0x0502 #include <windows.h> #include <utils/winutils.h> -- GitLab