---

yaml
---
r: 52188
b: refs/heads/dist-snap
c: 11a3072
h: refs/heads/master
v: v3

Author: graydon

[refs]

@@ -7,7 +7,7 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
 refs/heads/incoming: 44d4d6de762f3f9aae1fedcf454c66b79b3ad58d
-refs/heads/dist-snap: fa55778f9cc7faf6aacdb49dd47a631d38499da5
+refs/heads/dist-snap: 11a307294a83c2651405137763c9d620ab3fc7e7
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/libcore/libc.rs

@@ -400,8 +400,8 @@ pub mod types {
                 pub type ssize_t = i64;
             }
             pub mod posix01 {
+                use libc::types::common::c99::{uint8_t, uint32_t, int32_t};
                 use libc::types::os::arch::c95::{c_long, time_t};
-                use libc::types::os::arch::c99::{uint8_t, uint32_t, int32_t};
                 use libc::types::os::arch::posix88::{dev_t, gid_t, ino_t};
                 use libc::types::os::arch::posix88::{mode_t, off_t};
                 use libc::types::os::arch::posix88::{uid_t};
@@ -513,6 +513,10 @@ pub mod types {
             pub mod bsd44 {
             }
             pub mod extra {
+                pub use libc::types::os::arch::c95::{c_void, c_char, c_int,
+                                                     c_ulong, wchar_t};
+                pub use libc::types::os::arch::c99::{c_ulonglong};
+
                 pub type BOOL = c_int;
                 pub type BYTE = u8;
                 pub type CCHAR = c_char;
@@ -1131,6 +1135,9 @@ pub mod funcs {
         #[nolink]
         #[abi = "cdecl"]
         pub extern mod stat_ {
+            use libc::funcs::posix88::stat_::stat;
+            use libc::types::os::arch::c95::{c_int, c_char};
+
             #[link_name = "_chmod"]
             fn chmod(path: *c_char, mode: c_int) -> c_int;
 
@@ -1147,6 +1154,9 @@ pub mod funcs {
         #[nolink]
         #[abi = "cdecl"]
         pub extern mod stdio {
+            use libc::types::common::c95::FILE;
+            use libc::types::os::arch::c95::{c_int, c_char};
+
             #[link_name = "_popen"]
             fn popen(command: *c_char, mode: *c_char) -> *FILE;
 
@@ -1163,6 +1173,8 @@ pub mod funcs {
         #[nolink]
         #[abi = "cdecl"]
         pub extern mod fcntl {
+            use libc::types::os::arch::c95::{c_int, c_char};
+
             #[link_name = "_open"]
             fn open(path: *c_char, oflag: c_int, mode: c_int) -> c_int;
 
@@ -1179,6 +1191,9 @@ pub mod funcs {
         #[nolink]
         #[abi = "cdecl"]
         pub extern mod unistd {
+            use libc::types::os::arch::c95::{c_int, c_uint, c_char,
+                                             c_long, size_t, c_void};
+
             #[link_name = "_access"]
             fn access(path: *c_char, amode: c_int) -> c_int;