---

yaml
---
r: 30830
b: refs/heads/incoming
c: 3dd8768
h: refs/heads/master
v: v3

Author: graydon

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: b41d5146cc4a80568a7a1e9bff2e6b89a91f9c11
+refs/heads/incoming: 3dd87689eeaebb809d6a79ad18e0c1f123f82826
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/libcore/os.rs

@@ -66,24 +66,23 @@ pub fn fill_charp_buf(f: fn(*mut c_char, size_t) -> bool)
 
 #[cfg(windows)]
 mod win32 {
-    use dword = libc::DWORD;
+    use libc::DWORD;
 
-    fn fill_utf16_buf_and_decode(f: fn(*mut u16, dword) -> dword)
+    fn fill_utf16_buf_and_decode(f: fn(*mut u16, DWORD) -> DWORD)
         -> Option<~str> {
-        use libc::dword;
-        let mut n = tmpbuf_sz as dword;
+        let mut n = tmpbuf_sz as DWORD;
         let mut res = None;
         let mut done = false;
         while !done {
             let buf = vec::to_mut(vec::from_elem(n as uint, 0u16));
             do vec::as_mut_buf(buf) |b, _sz| {
-                let k : dword = f(b, tmpbuf_sz as dword);
-                if k == (0 as dword) {
+                let k : DWORD = f(b, tmpbuf_sz as DWORD);
+                if k == (0 as DWORD) {
                     done = true;
                 } else if (k == n &&
                            libc::GetLastError() ==
-                           libc::ERROR_INSUFFICIENT_BUFFER as dword) {
-                    n *= (2 as dword);
+                           libc::ERROR_INSUFFICIENT_BUFFER as DWORD) {
+                    n *= (2 as DWORD);
                 } else {
                     let sub = vec::slice(buf, 0u, k as uint);
                     res = option::Some(str::from_utf16(sub));
@@ -394,7 +393,7 @@ pub fn self_exe_path() -> Option<Path> {
     fn load_self() -> Option<~str> {
         use win32::*;
         do fill_utf16_buf_and_decode() |buf, sz| {
-            libc::GetModuleFileNameW(0u as libc::dword, buf, sz)
+            libc::GetModuleFileNameW(0u as libc::DWORD, buf, sz)
         }
     }