Skip to content

Commit

Permalink
kfw: use _WIN64 names where appropriate
Browse files Browse the repository at this point in the history
Signed-off-by: Kevin Wasserman <kevin.wasserman@painless-security.com>

ticket: 7050

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@25571 dc483132-0cff-0310-8789-dd5450dbe970
  • Loading branch information
tlyu committed Dec 12, 2011
1 parent 5fa98cd commit 5f4d30b
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
4 changes: 4 additions & 0 deletions src/lib/krb5/os/init_os_ctx.c
Expand Up @@ -72,7 +72,11 @@ get_from_module_dir(
if (!name)
return ENOMEM;

#ifdef _WIN64
if (!GetModuleFileName(GetModuleHandle("krb5_64"), name, size))
#else
if (!GetModuleFileName(GetModuleHandle("krb5_32"), name, size))
#endif
goto cleanup;

p = name + strlen(name);
Expand Down
6 changes: 3 additions & 3 deletions src/util/wshelper/res_init.c
Expand Up @@ -759,10 +759,10 @@ this_module()
if (!hModWSHelp)
{
// Note: these must match the DEF file entries
#if defined (_WIN32)
hModWSHelp = GetModuleHandle("WSHELP32");
#if defined(_WIN64)
hModWSHelp = GetModuleHandle( "WSHELP64" );
#else
hModWSHelp = GetModuleHandle("WSHELPER");
hModWSHelp = GetModuleHandle( "WSHELP32" );
#endif
}
return hModWSHelp;
Expand Down

0 comments on commit 5f4d30b

Please sign in to comment.