Skip to content

Commit 0d830c5

Browse files
committed
---
yaml --- r: 41640 b: refs/heads/master c: 11a3072 h: refs/heads/master v: v3
1 parent 413c656 commit 0d830c5

File tree

2 files changed

+17
-2
lines changed

2 files changed

+17
-2
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: fa55778f9cc7faf6aacdb49dd47a631d38499da5
2+
refs/heads/master: 11a307294a83c2651405137763c9d620ab3fc7e7
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 2f46b763da2c098913884f101b6d71d69af41b49
55
refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650

trunk/src/libcore/libc.rs

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -400,8 +400,8 @@ pub mod types {
400400
pub type ssize_t = i64;
401401
}
402402
pub mod posix01 {
403+
use libc::types::common::c99::{uint8_t, uint32_t, int32_t};
403404
use libc::types::os::arch::c95::{c_long, time_t};
404-
use libc::types::os::arch::c99::{uint8_t, uint32_t, int32_t};
405405
use libc::types::os::arch::posix88::{dev_t, gid_t, ino_t};
406406
use libc::types::os::arch::posix88::{mode_t, off_t};
407407
use libc::types::os::arch::posix88::{uid_t};
@@ -513,6 +513,10 @@ pub mod types {
513513
pub mod bsd44 {
514514
}
515515
pub mod extra {
516+
pub use libc::types::os::arch::c95::{c_void, c_char, c_int,
517+
c_ulong, wchar_t};
518+
pub use libc::types::os::arch::c99::{c_ulonglong};
519+
516520
pub type BOOL = c_int;
517521
pub type BYTE = u8;
518522
pub type CCHAR = c_char;
@@ -1131,6 +1135,9 @@ pub mod funcs {
11311135
#[nolink]
11321136
#[abi = "cdecl"]
11331137
pub extern mod stat_ {
1138+
use libc::funcs::posix88::stat_::stat;
1139+
use libc::types::os::arch::c95::{c_int, c_char};
1140+
11341141
#[link_name = "_chmod"]
11351142
fn chmod(path: *c_char, mode: c_int) -> c_int;
11361143

@@ -1147,6 +1154,9 @@ pub mod funcs {
11471154
#[nolink]
11481155
#[abi = "cdecl"]
11491156
pub extern mod stdio {
1157+
use libc::types::common::c95::FILE;
1158+
use libc::types::os::arch::c95::{c_int, c_char};
1159+
11501160
#[link_name = "_popen"]
11511161
fn popen(command: *c_char, mode: *c_char) -> *FILE;
11521162

@@ -1163,6 +1173,8 @@ pub mod funcs {
11631173
#[nolink]
11641174
#[abi = "cdecl"]
11651175
pub extern mod fcntl {
1176+
use libc::types::os::arch::c95::{c_int, c_char};
1177+
11661178
#[link_name = "_open"]
11671179
fn open(path: *c_char, oflag: c_int, mode: c_int) -> c_int;
11681180

@@ -1179,6 +1191,9 @@ pub mod funcs {
11791191
#[nolink]
11801192
#[abi = "cdecl"]
11811193
pub extern mod unistd {
1194+
use libc::types::os::arch::c95::{c_int, c_uint, c_char,
1195+
c_long, size_t, c_void};
1196+
11821197
#[link_name = "_access"]
11831198
fn access(path: *c_char, amode: c_int) -> c_int;
11841199

0 commit comments

Comments
 (0)