From 812ce6c190d896cf1cc1bef9f22c00266e962c43 Mon Sep 17 00:00:00 2001
From: we <vadim.petrochenkov@gmail.com>
Date: Sat, 17 Jan 2015 07:34:10 +0300
Subject: Remove unnecessary explicit conversions to *const T

---
 src/libstd/sys/unix/backtrace.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/libstd/sys')

diff --git a/src/libstd/sys/unix/backtrace.rs b/src/libstd/sys/unix/backtrace.rs
index 7164931c55a..70b9c012b00 100644
--- a/src/libstd/sys/unix/backtrace.rs
+++ b/src/libstd/sys/unix/backtrace.rs
@@ -229,7 +229,7 @@ fn print(w: &mut Writer, idx: int, addr: *mut libc::c_void) -> IoResult<()> {
     }
 
     let mut info: Dl_info = unsafe { intrinsics::init() };
-    if unsafe { dladdr(addr as *const libc::c_void, &mut info) == 0 } {
+    if unsafe { dladdr(addr, &mut info) == 0 } {
         output(w, idx,addr, None)
     } else {
         output(w, idx, addr, Some(unsafe {
-- 
cgit 1.4.1-3-g733a5


From b57662aed70fefd03cc50279644b736ddf4d72aa Mon Sep 17 00:00:00 2001
From: Peter Atashian <retep998@gmail.com>
Date: Mon, 19 Jan 2015 03:43:44 -0500
Subject: Fix HMODULE

Signed-off-by: Peter Atashian <retep998@gmail.com>
---
 src/liblibc/lib.rs           | 3 ++-
 src/libstd/sys/windows/os.rs | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/libstd/sys')

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())
     }
 }
-- 
cgit 1.4.1-3-g733a5