---

yaml
---
r: 41647
b: refs/heads/master
c: bea3a7a
h: refs/heads/master
i:
  41645: 7d349cc
  41643: 223cef8
  41639: 413c656
  41631: 62bd2c4
v: v3

Author: pcwalton

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: bd737d41a1fca9825e6dea8abcb077aa86463b52
+refs/heads/master: bea3a7a14cdb6eee76d75729b5bb4b367e005225
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 2f46b763da2c098913884f101b6d71d69af41b49
 refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650

trunk/src/libcore/libc.rs

@@ -514,8 +514,9 @@ pub mod types {
             }
             pub mod extra {
                 use libc::types::common::c95::c_void;
-                use libc::types::os::arch::c95::{c_char, c_int,
-                                                     c_ulong, wchar_t};
+                use libc::types::os::arch::c95::{c_char, c_int, c_uint};
+                use libc::types::os::arch::c95::{c_long, c_ulong};
+                use libc::types::os::arch::c95::{wchar_t};
                 use libc::types::os::arch::c99::{c_ulonglong};
 
                 pub type BOOL = c_int;
@@ -1195,6 +1196,7 @@ pub mod funcs {
             use libc::types::common::c95::c_void;
             use libc::types::os::arch::c95::{c_int, c_uint, c_char,
                                              c_long, size_t};
+            use libc::types::os::arch::c99::intptr_t;
 
             #[link_name = "_access"]
             fn access(path: *c_char, amode: c_int) -> c_int;
@@ -1490,6 +1492,10 @@ pub mod funcs {
 
     #[cfg(target_os = "win32")]
     pub mod extra {
+        use libc::types::os::arch::c95::c_int;
+        use libc::types::os::arch::extra::{DWORD, HMODULE, LPCWSTR, LPWSTR};
+        use libc::types::os::arch::extra::{BOOL, LPSECURITY_ATTRIBUTES};
+
         #[abi = "stdcall"]
         pub extern mod kernel32 {
             fn GetEnvironmentVariableW(n: LPCWSTR,

trunk/src/libcore/os.rs

@@ -64,8 +64,7 @@ extern mod rustrt {
     fn rust_set_exit_status(code: libc::intptr_t);
 }
 
-
-const tmpbuf_sz : uint = 1000u;
+pub const tmpbuf_sz : uint = 1000u;
 
 pub fn getcwd() -> Path {
     Path(rustrt::rust_getcwd())
@@ -92,7 +91,9 @@ pub mod win32 {
     use libc;
     use vec;
     use str;
+    use option::{None, Option};
     use option;
+    use os::tmpbuf_sz;
     use libc::types::os::arch::extra::DWORD;
 
     pub fn fill_utf16_buf_and_decode(f: fn(*mut u16, DWORD) -> DWORD)