diff options
| author | bors <bors@rust-lang.org> | 2016-01-15 11:59:11 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2016-01-15 11:59:11 +0000 |
| commit | 1f4e317e45349eb2d3c853e96bfd24dd574b36d1 (patch) | |
| tree | 88ad81e57e6ad22f242754edf6143167fda74a5a /src/libstd/os | |
| parent | a70a60a02bca4c1fb75a0eb0ecf80acb73972f66 (diff) | |
| parent | 4f8d584aa586a4e31be3b73233d37cd0ee2ba03b (diff) | |
| download | rust-1f4e317e45349eb2d3c853e96bfd24dd574b36d1.tar.gz rust-1f4e317e45349eb2d3c853e96bfd24dd574b36d1.zip | |
Auto merge of #30929 - Manishearth:rollup, r=Manishearth
- Successful merges: #30591, #30781, #30836, #30864, #30896, #30898, #30908, #30921, #30925 - Failed merges:
Diffstat (limited to 'src/libstd/os')
| -rw-r--r-- | src/libstd/os/linux/raw.rs | 3 | ||||
| -rw-r--r-- | src/libstd/os/openbsd/raw.rs | 2 | ||||
| -rw-r--r-- | src/libstd/os/raw.rs | 10 |
3 files changed, 11 insertions, 4 deletions
diff --git a/src/libstd/os/linux/raw.rs b/src/libstd/os/linux/raw.rs index f44199f311b..953d0917141 100644 --- a/src/libstd/os/linux/raw.rs +++ b/src/libstd/os/linux/raw.rs @@ -205,7 +205,8 @@ mod arch { } } -#[cfg(target_arch = "x86_64")] +#[cfg(any(target_arch = "x86_64", target_arch = "powerpc64", + target_arch = "powerpc64le"))] mod arch { use super::{dev_t, mode_t}; use os::raw::{c_long, c_int}; diff --git a/src/libstd/os/openbsd/raw.rs b/src/libstd/os/openbsd/raw.rs index 209546c4e4f..b4d49395303 100644 --- a/src/libstd/os/openbsd/raw.rs +++ b/src/libstd/os/openbsd/raw.rs @@ -16,7 +16,7 @@ use os::raw::c_long; use os::unix::raw::{uid_t, gid_t}; #[stable(feature = "raw_ext", since = "1.1.0")] pub type blkcnt_t = i64; -#[stable(feature = "raw_ext", since = "1.1.0")] pub type blksize_t = u32; +#[stable(feature = "raw_ext", since = "1.1.0")] pub type blksize_t = i32; #[stable(feature = "raw_ext", since = "1.1.0")] pub type dev_t = i32; #[stable(feature = "raw_ext", since = "1.1.0")] pub type fflags_t = u32; #[stable(feature = "raw_ext", since = "1.1.0")] pub type ino_t = u64; diff --git a/src/libstd/os/raw.rs b/src/libstd/os/raw.rs index 3bc063f4269..62080fee48e 100644 --- a/src/libstd/os/raw.rs +++ b/src/libstd/os/raw.rs @@ -14,11 +14,17 @@ #[cfg(any(target_os = "android", all(target_os = "linux", any(target_arch = "aarch64", - target_arch = "arm"))))] + target_arch = "arm", + target_arch = "powerpc", + target_arch = "powerpc64", + target_arch = "powerpc64le"))))] #[stable(feature = "raw_os", since = "1.1.0")] pub type c_char = u8; #[cfg(not(any(target_os = "android", all(target_os = "linux", any(target_arch = "aarch64", - target_arch = "arm")))))] + target_arch = "arm", + target_arch = "powerpc", + target_arch = "powerpc64", + target_arch = "powerpc64le")))))] #[stable(feature = "raw_os", since = "1.1.0")] pub type c_char = i8; #[stable(feature = "raw_os", since = "1.1.0")] pub type c_schar = i8; #[stable(feature = "raw_os", since = "1.1.0")] pub type c_uchar = u8; |