Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade c-ares #1678

Merged
merged 3 commits into from
May 12, 2015
Merged

Upgrade c-ares #1678

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7e1c0e7
deps: sync with upstream bagder/c-ares@bba4dc5
bnoordhuis May 11, 2015
0f850f7
deps: provide TXT chunk info in c-ares
indutny Mar 27, 2014
08d0866
src,deps: replace LoadLibrary by LoadLibraryW
zcbenz Dec 31, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
src,deps: replace LoadLibrary by LoadLibraryW 
On Windows, when compiling with `UNICODE` defined, `LoadLibrary` becomes
`LoadLibraryW`. When an ASCII string is passed to that function it
crashes.

PR-URL: #226
Reviewed-By: Bert Belder <bertbelder@gmail.com>
  • Loading branch information
@zcbenz @bnoordhuis
zcbenz authored and bnoordhuis committed May 12, 2015
commit 08d08668c957d990e0c52b733e3b29d939a61113
4 changes: 2 additions & 2 deletions deps/cares/src/ares_library_init.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ static int ares_win32_init(void)
#ifdef USE_WINSOCK

hnd_iphlpapi = 0;
hnd_iphlpapi = LoadLibrary("iphlpapi.dll");
hnd_iphlpapi = LoadLibraryW(L"iphlpapi.dll");
if (!hnd_iphlpapi)
return ARES_ELOADIPHLPAPI;

Expand Down Expand Up @@ -73,7 +73,7 @@ static int ares_win32_init(void)
*/

hnd_advapi32 = 0;
hnd_advapi32 = LoadLibrary("advapi32.dll");
hnd_advapi32 = LoadLibraryW(L"advapi32.dll");
if (hnd_advapi32)
{
ares_fpSystemFunction036 = (fpSystemFunction036_t)
Expand Down