diff options
author | bors <bors@rust-lang.org> | 2017-07-24 21:36:42 +0000 |
---|---|---|
committer | bors <bors@rust-lang.org> | 2017-07-24 21:36:42 +0000 |
commit | 46863a35e5af38d3e0bd374bd886b9fc6e513d79 (patch) | |
tree | c2598dfc658bee0cd3786bdabd373781fa348c2a | |
parent | 6c660c91668236ec20cf5e6047dcd969124539f6 (diff) | |
parent | 0bc6e03b285c4bc343ed255792a1968bec780db8 (diff) | |
download | rust-libc-46863a35e5af38d3e0bd374bd886b9fc6e513d79.tar.gz |
Auto merge of #694 - dhduvall:master, r=alexcrichton
PTHREAD_PROCESS_PRIVATE needs to be a 16-bit type on Solaris
Compiles of libc on Solaris fail because we're trying to assign a 32-bit constant to a 16-bit struct member.
-rw-r--r-- | src/unix/solaris/mod.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/unix/solaris/mod.rs b/src/unix/solaris/mod.rs index dcadcf0816..5b905f199f 100644 --- a/src/unix/solaris/mod.rs +++ b/src/unix/solaris/mod.rs @@ -773,7 +773,7 @@ pub const POSIX_MADV_DONTNEED: ::c_int = 4; pub const PTHREAD_CREATE_JOINABLE: ::c_int = 0; pub const PTHREAD_CREATE_DETACHED: ::c_int = 0x40; pub const PTHREAD_PROCESS_SHARED: ::c_int = 1; -pub const PTHREAD_PROCESS_PRIVATE: ::c_int = 0; +pub const PTHREAD_PROCESS_PRIVATE: ::c_ushort = 0; pub const PTHREAD_STACK_MIN: ::size_t = 4096; pub const SIGSTKSZ: ::size_t = 8192; |