diff options
| author | Tom Yu <tlyu@mit.edu> | 2011-12-12 20:46:27 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 2011-12-12 20:46:27 +0000 |
| commit | 5f4d30b2f9ec3cdd47e5a8e2bf6c8586081f4ab9 (patch) | |
| tree | 9fc183a361707e388bdd139f59135b24643122fa | |
| parent | 5fa98cdabb89a772e138c9e68b475f33458c8ef0 (diff) | |
| download | krb5-5f4d30b2f9ec3cdd47e5a8e2bf6c8586081f4ab9.tar.gz krb5-5f4d30b2f9ec3cdd47e5a8e2bf6c8586081f4ab9.tar.xz krb5-5f4d30b2f9ec3cdd47e5a8e2bf6c8586081f4ab9.zip | |
kfw: use _WIN64 names where appropriate
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
| -rw-r--r-- | src/lib/krb5/os/init_os_ctx.c | 4 | ||||
| -rw-r--r-- | src/util/wshelper/res_init.c | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/lib/krb5/os/init_os_ctx.c b/src/lib/krb5/os/init_os_ctx.c index bba1883fa..f7dc42994 100644 --- a/src/lib/krb5/os/init_os_ctx.c +++ b/src/lib/krb5/os/init_os_ctx.c @@ -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); diff --git a/src/util/wshelper/res_init.c b/src/util/wshelper/res_init.c index bf3d97b50..743b0c792 100644 --- a/src/util/wshelper/res_init.c +++ b/src/util/wshelper/res_init.c @@ -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; |