diff options
| author | Corey Farwell <coreyf@rwell.org> | 2017-08-02 01:22:29 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-02 01:22:29 +0000 |
| commit | 1c91c785da69c701a12a5958b01dd1b5306762cd (patch) | |
| tree | 04201b09e4c8fc5a07973f165041b1b6b7f56e93 /src/libstd | |
| parent | 08c0bbd06285f14f9bee91e13d1dc158c5235a14 (diff) | |
| parent | bdb53e55b0d30ad4f5438eff74d0b705f8675d98 (diff) | |
| download | rust-1c91c785da69c701a12a5958b01dd1b5306762cd.tar.gz rust-1c91c785da69c701a12a5958b01dd1b5306762cd.zip | |
Rollup merge of #43597 - dhduvall:master, r=alexcrichton
Fix the Solaris pthread_t raw type in std to match what's in libc The old type causes failures when building cargo 0.20.0 after rust-lang/libc@8304e06b5.
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/os/solaris/raw.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/os/solaris/raw.rs b/src/libstd/os/solaris/raw.rs index b84fdba9ca2..5a813c5c76b 100644 --- a/src/libstd/os/solaris/raw.rs +++ b/src/libstd/os/solaris/raw.rs @@ -32,7 +32,7 @@ use os::unix::raw::{uid_t, gid_t}; #[stable(feature = "raw_ext", since = "1.1.0")] pub type time_t = i64; #[stable(feature = "pthread_t", since = "1.8.0")] -pub type pthread_t = usize; +pub type pthread_t = u32; #[repr(C)] #[derive(Clone)] |