diff options
| author | Amir Masoud Abdol <[email protected]> | 2023-05-23 15:04:17 +0200 |
|---|---|---|
| committer | Amir Masoud Abdol <[email protected]> | 2023-06-08 01:18:04 +0200 |
| commit | 1dfa922606e497918e57a6a06f96ee63b7fb163e (patch) | |
| tree | 37058b862a9ba496f3330aba57183123ba132ea2 /src/network/socket/qnativesocketengine_win.cpp | |
| parent | 076b4bed9f418f97f9fb29fce4f948f0d98854c1 (diff) | |
Remove the manual undef of the min/max macros, or def NOMINMAX
We now add NOMINMAX to PlatformCommonInternal target which will be
linked to everything else, so min/max will not be defined upon the
inclusion of `windows.h`, or other headers.
Pick-to: 6.5 6.6
Change-Id: I10016720dac7ce015e929885b7368ee86d8b6918
Reviewed-by: Alexandru Croitor <[email protected]>
Diffstat (limited to 'src/network/socket/qnativesocketengine_win.cpp')
| -rw-r--r-- | src/network/socket/qnativesocketengine_win.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/network/socket/qnativesocketengine_win.cpp b/src/network/socket/qnativesocketengine_win.cpp index d578e5230fd..16d974a68be 100644 --- a/src/network/socket/qnativesocketengine_win.cpp +++ b/src/network/socket/qnativesocketengine_win.cpp @@ -2,9 +2,6 @@ // Copyright (C) 2016 Intel Corporation. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only -// Prevent windows system header files from defining min/max as macros. -#define NOMINMAX 1 - #include <winsock2.h> #include <ws2tcpip.h> |