diff options
| author | bors <bors@rust-lang.org> | 2016-12-24 21:14:17 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2016-12-24 21:14:17 +0000 |
| commit | e60aa62ffe7462d48cb44ab33f2551b466745e83 (patch) | |
| tree | 97d19ca2d9cedb110340266922ae30aab94347b3 /src/libstd/sys | |
| parent | 00e61d41859514c906b8b630ea10ececa4f0c2cd (diff) | |
| parent | df63b0ce720a846e8c7983b1b26ed3e3d36ba972 (diff) | |
| download | rust-e60aa62ffe7462d48cb44ab33f2551b466745e83.tar.gz rust-e60aa62ffe7462d48cb44ab33f2551b466745e83.zip | |
Auto merge of #38594 - steveklabnik:rollup, r=steveklabnik
Rollup of 14 pull requests - Successful merges: #37956, #38013, #38297, #38480, #38497, #38502, #38505, #38513, #38521, #38549, #38554, #38557, #38568, #38572 - Failed merges:
Diffstat (limited to 'src/libstd/sys')
| -rw-r--r-- | src/libstd/sys/unix/process/magenta.rs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/libstd/sys/unix/process/magenta.rs b/src/libstd/sys/unix/process/magenta.rs index 319fbce35cd..2bb005be4ec 100644 --- a/src/libstd/sys/unix/process/magenta.rs +++ b/src/libstd/sys/unix/process/magenta.rs @@ -23,7 +23,6 @@ pub type mx_rights_t = u32; pub type mx_status_t = i32; pub type mx_size_t = usize; -pub type mx_ssize_t = isize; pub const MX_HANDLE_INVALID: mx_handle_t = 0; |