Skip to content

GitLab

"tests/vscode:/vscode.git/clone" did not exist on "ccb32e8ec35223e862fb8e1397eda0a9916cd430"
Unverified Commit 100a10da authored by shiyu1994's avatar shiyu1994 Committed by GitHub
Browse files

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

parent 2e257192
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
src/network/socket_wrapper.hpp
View file @ 100a10da
...@@ -60,6 +60,9 @@ const int INVALID_SOCKET = -1; ...@@ -60,6 +60,9 @@ const int INVALID_SOCKET = -1;
#endif #endif
#ifdef _WIN32 #ifdef _WIN32
#ifndef _UCRT
// Recent MinGW has inet_pton, which then causes compiler error in
// combination with this replacement.
#ifndef _MSC_VER #ifndef _MSC_VER
// not using visual studio in windows // not using visual studio in windows
inline int inet_pton(int af, const char *src, void *dst) { 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) { ...@@ -86,6 +89,7 @@ inline int inet_pton(int af, const char *src, void *dst) {
} }
#endif #endif
#endif #endif
#endif
#define MALLOC(x) HeapAlloc(GetProcessHeap(), 0, (x)) #define MALLOC(x) HeapAlloc(GetProcessHeap(), 0, (x))
#define FREE(x) HeapFree(GetProcessHeap(), 0, (x)) #define FREE(x) HeapFree(GetProcessHeap(), 0, (x))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment