apply patch for R4.2 on Windows (#4923)

100a10da · shiyu1994 · GitHub · 2e257192 · 100a10da
Unverified Commit 100a10da authored Jan 05, 2022 by shiyu1994 Committed by GitHub Jan 05, 2022
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

src/network/socket_wrapper.hpp src/network/socket_wrapper.hpp +4 -0

No files found.
--- a/src/network/socket_wrapper.hpp
+++ b/src/network/socket_wrapper.hpp
@@ -60,6 +60,9 @@ const int INVALID_SOCKET = -1;
 #endif

 #ifdef _WIN32
+#ifndef _UCRT
+// Recent MinGW has inet_pton, which then causes compiler error in
+// combination with this replacement.
 #ifndef _MSC_VER
 // not using visual studio in windows
 inline int inet_pton(int af, const char *src, void *dst) {
@@ -86,6 +89,7 @@ inline int inet_pton(int af, const char *src, void *dst) {
 }
 #endif
 #endif
+#endif

 #define MALLOC(x) HeapAlloc(GetProcessHeap(), 0, (x))
 #define FREE(x) HeapFree(GetProcessHeap(), 0, (x))