---

yaml
---
r: 24297
b: refs/heads/master
c: 4f323d0
h: refs/heads/master
i:
  24295: aea4fbb
v: v3

Author: catamorphism

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 3639d38d5c982193eab8304f2adfe0fcd2dd84bd
+refs/heads/master: 4f323d05da658da7debfcb0c878815889f9571e8
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/src/libcore/os.rs

@@ -328,7 +328,7 @@ pub fn pipe() -> {in: c_int, out: c_int} {
     // in rust_run_program.
     let fds = { mut in: 0 as c_int,
                 mut out: 0 as c_int };
-    let res = libc::pipe(ptr::mut_addr_of(fds.in),
+    let res = libc::pipe(ptr::mut_addr_of(&(fds.in)),
                          1024 as c_uint,
                          (libc::O_BINARY | libc::O_NOINHERIT) as c_int);
     assert (res == 0 as c_int);
@@ -365,7 +365,7 @@ pub fn self_exe_path() -> Option<Path> {
                            KERN_PROC as c_int,
                            KERN_PROC_PATHNAME as c_int, -1 as c_int];
                 sysctl(vec::raw::to_ptr(mib), vec::len(mib) as c_uint,
-                       buf as *mut c_void, ptr::mut_addr_of(sz),
+                       buf as *mut c_void, ptr::mut_addr_of(&sz),
                        ptr::null(), 0u as size_t) == (0 as c_int)
             }
         }