diff options
| -rw-r--r-- | src/liblibc/lib.rs | 3 | ||||
| -rw-r--r-- | src/libstd/sys/windows/os.rs | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/liblibc/lib.rs b/src/liblibc/lib.rs index d010615a24c..fa6468517e6 100644 --- a/src/liblibc/lib.rs +++ b/src/liblibc/lib.rs @@ -1541,7 +1541,8 @@ pub mod types { pub type DWORDLONG = c_ulonglong; pub type HANDLE = LPVOID; - pub type HMODULE = c_uint; + pub type HINSTANCE = HANDLE; + pub type HMODULE = HINSTANCE; pub type LONG = c_long; pub type PLONG = *mut c_long; diff --git a/src/libstd/sys/windows/os.rs b/src/libstd/sys/windows/os.rs index 4540068133b..e9490dc95c9 100644 --- a/src/libstd/sys/windows/os.rs +++ b/src/libstd/sys/windows/os.rs @@ -281,7 +281,7 @@ pub fn join_paths<T: BytesContainer>(paths: &[T]) -> Result<Vec<u8>, &'static st pub fn load_self() -> Option<Vec<u8>> { unsafe { fill_utf16_buf_and_decode(|buf, sz| { - libc::GetModuleFileNameW(0u as libc::DWORD, buf, sz) + libc::GetModuleFileNameW(ptr::null_mut(), buf, sz) }).map(|s| s.to_string().into_bytes()) } } |