diff options
| author | bors <bors@rust-lang.org> | 2015-12-05 20:49:16 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-12-05 20:49:16 +0000 |
| commit | aad4e5665e81a3ec998b3648d395d0eb99a7500b (patch) | |
| tree | 7c9286e32c368bcfb7eb295fd4b35e9eb7285c01 /src/libstd/os/linux | |
| parent | 9f715e98925adbf205bccd8a044266c77197db50 (diff) | |
| parent | 9749a193d629dd723562004879bca3e2d47e25a1 (diff) | |
| download | rust-aad4e5665e81a3ec998b3648d395d0eb99a7500b.tar.gz rust-aad4e5665e81a3ec998b3648d395d0eb99a7500b.zip | |
Auto merge of #30177 - retep998:handling-threads, r=alexcrichton
Allows a `HANDLE` to be extracted from a `JoinHandle` on Windows. Allows a `pthread_t` to be extracted from a `JoinHandle` everywhere else. Because https://github.com/rust-lang/rust/pull/29461 was closed. r? @alexcrichton
Diffstat (limited to 'src/libstd/os/linux')
| -rw-r--r-- | src/libstd/os/linux/raw.rs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/libstd/os/linux/raw.rs b/src/libstd/os/linux/raw.rs index 35de9bfc194..f44199f311b 100644 --- a/src/libstd/os/linux/raw.rs +++ b/src/libstd/os/linux/raw.rs @@ -12,9 +12,13 @@ #![stable(feature = "raw_ext", since = "1.1.0")] +use os::raw::c_ulong; + #[stable(feature = "raw_ext", since = "1.1.0")] pub type dev_t = u64; #[stable(feature = "raw_ext", since = "1.1.0")] pub type mode_t = u32; +#[unstable(feature = "pthread_t", issue = "29791")] pub type pthread_t = c_ulong; + #[doc(inline)] #[stable(feature = "raw_ext", since = "1.1.0")] pub use self::arch::{off_t, ino_t, nlink_t, blksize_t, blkcnt_t, stat, time_t}; |