diff options
| author | Amir Masoud Abdol <amir.abdol@qt.io> | 2023-05-23 15:04:17 +0200 |
|---|---|---|
| committer | Amir Masoud Abdol <amir.abdol@qt.io> | 2023-06-08 01:18:04 +0200 |
| commit | 1dfa922606e497918e57a6a06f96ee63b7fb163e (patch) | |
| tree | 37058b862a9ba496f3330aba57183123ba132ea2 /src/plugins/tls | |
| 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 <alexandru.croitor@qt.io>
Diffstat (limited to 'src/plugins/tls')
| -rw-r--r-- | src/plugins/tls/openssl/qdtls_openssl.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/plugins/tls/openssl/qdtls_openssl.cpp b/src/plugins/tls/openssl/qdtls_openssl.cpp index 78288d8dd1..fc07a29ec8 100644 --- a/src/plugins/tls/openssl/qdtls_openssl.cpp +++ b/src/plugins/tls/openssl/qdtls_openssl.cpp @@ -1,10 +1,6 @@ // Copyright (C) 2018 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only -#ifndef NOMINMAX -#define NOMINMAX -#endif // NOMINMAX - #include <QtNetwork/private/qnativesocketengine_p_p.h> #include "qsslsocket_openssl_symbols_p.h" |