Skip to content

Commit 4f2a526

Browse files
committed
---
yaml --- r: 52186 b: refs/heads/dist-snap c: d0fa688 h: refs/heads/master v: v3
1 parent 457bf76 commit 4f2a526

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
99
refs/heads/incoming: 44d4d6de762f3f9aae1fedcf454c66b79b3ad58d
10-
refs/heads/dist-snap: dd5734d4878ac259752e4495b90012cef4990862
10+
refs/heads/dist-snap: d0fa688f561e051c01110a0a102adf8a4236fc91
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1212
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1313
refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

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

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -243,6 +243,12 @@ pub mod types {
243243
pub type ssize_t = i32;
244244
}
245245
pub mod posix01 {
246+
use libc::types::os::arch::c95::{c_int, c_short, c_long,
247+
time_t};
248+
use libc::types::os::arch::posix88::{dev_t, gid_t, ino_t};
249+
use libc::types::os::arch::posix88::{mode_t, off_t};
250+
use libc::types::os::arch::posix88::{uid_t};
251+
246252
pub type nlink_t = u32;
247253
pub type blksize_t = i32;
248254
pub type blkcnt_t = i32;
@@ -443,9 +449,8 @@ pub mod types {
443449
pub mod common {
444450
pub mod posix01 {
445451
use libc::types::os::arch::c95::{c_int, c_short};
446-
use libc::types::os::arch::c99::int64_t;
447-
use libc::types::os::arch::extra::time64_t;
448-
use libc::types::os::arch::posix88::{dev_t, gid_t, ino_t};
452+
use libc::types::os::arch::extra::{int64, time64_t};
453+
use libc::types::os::arch::posix88::{dev_t, ino_t};
449454
use libc::types::os::arch::posix88::mode_t;
450455

451456
// Note: this is the struct called stat64 in win32. Not stat,
@@ -458,7 +463,7 @@ pub mod types {
458463
st_uid: c_short,
459464
st_gid: c_short,
460465
st_rdev: dev_t,
461-
st_size: int64_t,
466+
st_size: int64,
462467
st_atime: time64_t,
463468
st_mtime: time64_t,
464469
st_ctime: time64_t,
@@ -539,6 +544,7 @@ pub mod types {
539544
pub type WORD = u16;
540545

541546
pub type time64_t = i64;
547+
pub type int64 = i64;
542548
}
543549
}
544550
}

0 commit comments

Comments
 (0)