From c6f050a4349339f812cdc3131ce104057424f492 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Tue, 23 Oct 2018 03:51:49 -0700 Subject: mingw: load system libraries the recommended way When we access IPv6-related functions, we load the corresponding system library using the `LoadLibrary()` function, which is not the recommended way to load system libraries. In practice, it does not make a difference: the `ws2_32.dll` library containing the IPv6 functions is already loaded into memory, so LoadLibrary() simply reuses the already-loaded library. Still, recommended way is recommended way, so let's use that instead. While at it, also adjust the code in contrib/ that loads system libraries. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano --- compat/mingw.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'compat') diff --git a/compat/mingw.c b/compat/mingw.c index 18caf21969..9fd7db571b 100644 --- a/compat/mingw.c +++ b/compat/mingw.c @@ -1577,7 +1577,8 @@ static void ensure_socket_initialization(void) WSAGetLastError()); for (name = libraries; *name; name++) { - ipv6_dll = LoadLibrary(*name); + ipv6_dll = LoadLibraryExA(*name, NULL, + LOAD_LIBRARY_SEARCH_SYSTEM32); if (!ipv6_dll) continue; -- cgit v1.3