summaryrefslogtreecommitdiff
path: root/compat/mingw.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-10-30 06:43:48 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-10-30 06:43:48 (GMT)
commit97ffca6cc74e5313a7d503f76fe2a99f13750c69 (patch)
tree905381a7a4b8a3b2c49a3b0781adaa58808a8109 /compat/mingw.c
parentcc6748720f9014b2c2cea8a603acd9ff6a62b87c (diff)
parentc6f050a4349339f812cdc3131ce104057424f492 (diff)
downloadgit-97ffca6cc74e5313a7d503f76fe2a99f13750c69.zip
git-97ffca6cc74e5313a7d503f76fe2a99f13750c69.tar.gz
git-97ffca6cc74e5313a7d503f76fe2a99f13750c69.tar.bz2
Merge branch 'js/mingw-load-sys-dll'
The way DLLs are loaded on the Windows port has been improved. * js/mingw-load-sys-dll: mingw: load system libraries the recommended way
Diffstat (limited to 'compat/mingw.c')
-rw-r--r--compat/mingw.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/compat/mingw.c b/compat/mingw.c
index 6c3c4ca..81ef242 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -1624,7 +1624,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;