---

nikomatsakis · nikomatsakis · commit c9365663127d · 2011-12-01T19:31:12.000-08:00
yaml --- r: 6539 b: refs/heads/master c: dfb2c15 h: refs/heads/master i: 6537: 54a8394 6535: 1de40c7 v: v3
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9b3f8bf2a9a78ab41f6dc112162a64287ce56d89
+refs/heads/master: dfb2c15bbaff69b47240e81f6331fb11cbc24e48
diff --git a/trunk/src/lib/fs.rs b/trunk/src/lib/fs.rs
@@ -183,7 +183,7 @@ fn change_dir(p: path) -> bool {
 
     #[cfg(target_os = "win32")]
     fn chdir(_p: path) -> bool {
-        ret str::as_buf(_p, {|buf| os::kernel32::SetCurrentDirectory(buf)});
+        ret str::as_buf(_p, {|buf| os::kernel32::SetCurrentDirectoryA(buf)});
     }
 
     #[cfg(target_os = "linux")]
diff --git a/trunk/src/lib/win32_os.rs b/trunk/src/lib/win32_os.rs
@@ -55,7 +55,7 @@ native mod kernel32 {
     fn CreateDirectoryA(lpPathName: LPCTSTR,
                         lpSecurityAttributes: LPSECURITY_ATTRIBUTES) -> bool;
     fn RemoveDirectoryA(lpPathName: LPCTSTR) -> bool;
-    fn SetCurrentDirectory(lpPathName: LPCTSTR) -> bool;
+    fn SetCurrentDirectoryA(lpPathName: LPCTSTR) -> bool;
 }
 
 // FIXME turn into constants

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`---`
`2`		`-refs/heads/master: 9b3f8bf2a9a78ab41f6dc112162a64287ce56d89`
	`2`	`+refs/heads/master: dfb2c15bbaff69b47240e81f6331fb11cbc24e48`
Original file line number	Diff line number	Diff line change
`@@ -183,7 +183,7 @@ fn change_dir(p: path) -> bool {`
`183`	`183`
`184`	`184`	`#[cfg(target_os = "win32")]`
`185`	`185`	`fn chdir(_p: path) -> bool {`
`186`		`- ret str::as_buf(_p, {\|buf\| os::kernel32::SetCurrentDirectory(buf)});`
	`186`	`+ ret str::as_buf(_p, {\|buf\| os::kernel32::SetCurrentDirectoryA(buf)});`
`187`	`187`	`}`
`188`	`188`
`189`	`189`	`#[cfg(target_os = "linux")]`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ native mod kernel32 {`
`55`	`55`	`fn CreateDirectoryA(lpPathName: LPCTSTR,`
`56`	`56`	`lpSecurityAttributes: LPSECURITY_ATTRIBUTES) -> bool;`
`57`	`57`	`fn RemoveDirectoryA(lpPathName: LPCTSTR) -> bool;`
`58`		`- fn SetCurrentDirectory(lpPathName: LPCTSTR) -> bool;`
	`58`	`+ fn SetCurrentDirectoryA(lpPathName: LPCTSTR) -> bool;`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`// FIXME turn into constants`