undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'js/mingw-load-sys-dll'

Browse Source 
The way DLLs are loaded on the Windows port has been improved.

* js/mingw-load-sys-dll:
  mingw: load system libraries the recommended way
This commit is contained in:
Junio C Hamano 2018-10-30 15:43:48 +09:00
commit 97ffca6cc7
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
compat/mingw.c
View File

@ -1624,7 +1624,8 @@ static void ensure_socket_initialization(void)
WSAGetLastError()); WSAGetLastError());
for (name = libraries; *name; name++) { for (name = libraries; *name; name++) {
ipv6_dll = LoadLibrary(*name); ipv6_dll = LoadLibraryExA(*name, NULL,
LOAD_LIBRARY_SEARCH_SYSTEM32);
if (!ipv6_dll) if (!ipv6_dll)
continue; continue;

3
contrib/credential/wincred/git-credential-wincred.c
View File

@ -75,7 +75,8 @@ static CredDeleteWT CredDeleteW;
static void load_cred_funcs(void) static void load_cred_funcs(void)
{ {
/* load DLLs */ /* load DLLs */
advapi = LoadLibrary("advapi32.dll"); advapi = LoadLibraryExA("advapi32.dll", NULL,
LOAD_LIBRARY_SEARCH_SYSTEM32);
if (!advapi) if (!advapi)
die("failed to load advapi32.dll"); die("failed to load advapi32.dll");