summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2021-11-18 13:57:05 (GMT)
committerKitware Robot <kwrobot@kitware.com>2021-11-18 13:57:26 (GMT)
commite64a0b6c3d4b83898a28584365c08ca8e493f8df (patch)
tree301a4c30dcdb1557cc60a6ca6b1a205be9fabd0a
parented9b971694b36d3001c0b68444819599270831b5 (diff)
parentacc14edd70707ed040a8ea12afd363018df7d2fc (diff)
downloadCMake-e64a0b6c3d4b83898a28584365c08ca8e493f8df.zip
CMake-e64a0b6c3d4b83898a28584365c08ca8e493f8df.tar.gz
CMake-e64a0b6c3d4b83898a28584365c08ca8e493f8df.tar.bz2
Merge topic 'backport-libuv-mingw-w64' into release-3.22
acc14edd70 libuv: Backport MinGW-w64 compilation fix to CMake 3.22 branch Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6735
-rw-r--r--Utilities/cmlibuv/include/uv/win.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/Utilities/cmlibuv/include/uv/win.h b/Utilities/cmlibuv/include/uv/win.h
index f86357b..9b5d5dc 100644
--- a/Utilities/cmlibuv/include/uv/win.h
+++ b/Utilities/cmlibuv/include/uv/win.h
@@ -45,7 +45,14 @@ typedef struct pollfd {
#endif
#include <mswsock.h>
+// Disable the typedef in mstcpip.h of MinGW.
+#define _TCP_INITIAL_RTO_PARAMETERS _TCP_INITIAL_RTO_PARAMETERS__AVOID
+#define TCP_INITIAL_RTO_PARAMETERS TCP_INITIAL_RTO_PARAMETERS__AVOID
+#define PTCP_INITIAL_RTO_PARAMETERS PTCP_INITIAL_RTO_PARAMETERS__AVOID
#include <ws2tcpip.h>
+#undef _TCP_INITIAL_RTO_PARAMETERS
+#undef TCP_INITIAL_RTO_PARAMETERS
+#undef PTCP_INITIAL_RTO_PARAMETERS
#include <windows.h>
#include <process.h>