std: more fixes for os.rs for windows

erickt · erickt · commit 03cc757fe90b · 2013-08-08T06:37:55.000-07:00
diff --git a/src/libstd/os.rs b/src/libstd/os.rs
@@ -642,7 +642,8 @@ pub fn make_dir(p: &Path, mode: c_int) -> bool {
             use os::win32::as_utf16_p;
             // FIXME: turn mode into something useful? #2623
             do as_utf16_p(p.to_str()) |buf| {
-                libc::CreateDirectoryW(buf, ptr::null()) != (0 as libc::BOOL)
+                libc::CreateDirectoryW(buf, ptr::null() as LPCWSTR)
+                    != (0 as libc::BOOL)
             }
         }
     }
@@ -1081,7 +1082,7 @@ pub fn last_os_error() -> ~str {
 
         let mut buf = [0 as c_char, ..TMPBUF_SZ];
 
-        do buf.as_imm_buf |buf, len| {
+        do buf.as_mut_buf |buf, len| {
             unsafe {
                 let res = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM |
                                          FORMAT_MESSAGE_IGNORE_INSERTS,

Original file line number	Diff line number	Diff line change
`@@ -642,7 +642,8 @@ pub fn make_dir(p: &Path, mode: c_int) -> bool {`
`642`	`642`	`use os::win32::as_utf16_p;`
`643`	`643`	`// FIXME: turn mode into something useful? #2623`
`644`	`644`	`do as_utf16_p(p.to_str()) \|buf\| {`
`645`		`- libc::CreateDirectoryW(buf, ptr::null()) != (0 as libc::BOOL)`
	`645`	`+ libc::CreateDirectoryW(buf, ptr::null() as LPCWSTR)`
	`646`	`+ != (0 as libc::BOOL)`
`646`	`647`	`}`
`647`	`648`	`}`
`648`	`649`	`}`
`@@ -1081,7 +1082,7 @@ pub fn last_os_error() -> ~str {`
`1081`	`1082`
`1082`	`1083`	`let mut buf = [0 as c_char, ..TMPBUF_SZ];`
`1083`	`1084`
`1084`		`- do buf.as_imm_buf \|buf, len\| {`
	`1085`	`+ do buf.as_mut_buf \|buf, len\| {`
`1085`	`1086`	`unsafe {`
`1086`	`1087`	`let res = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM \|`
`1087`	`1088`	`FORMAT_MESSAGE_IGNORE_INSERTS,`