diff options
| author | bors <bors@rust-lang.org> | 2014-12-27 13:11:48 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-12-27 13:11:48 +0000 |
| commit | 4a4c89c7a4a763c253a97ff04647f52aca6a5490 (patch) | |
| tree | e7d313c7ebc0418284ea65089db287cca633bc99 /src/libstd/sys/unix/stack_overflow.rs | |
| parent | 9be54be15b4b4ba5c1b22d958d7619a5154ab469 (diff) | |
| parent | 1a73ccc8db0a10e82632808e058645f2d6fa0095 (diff) | |
| download | rust-4a4c89c7a4a763c253a97ff04647f52aca6a5490.tar.gz rust-4a4c89c7a4a763c253a97ff04647f52aca6a5490.zip | |
auto merge of #20119 : FlaPer87/rust/oibit-send-and-friends, r=nikomatsakis
More work on opt-in built in traits. `Send` and `Sync` are not opt-in, `OwnedPtr` renamed to `UniquePtr` and the `Send` and `Sync` traits are now unsafe. NOTE: This likely needs to be rebased on top of the yet-to-land snapshot. r? @nikomatsakis cc #13231
Diffstat (limited to 'src/libstd/sys/unix/stack_overflow.rs')
| -rw-r--r-- | src/libstd/sys/unix/stack_overflow.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/sys/unix/stack_overflow.rs b/src/libstd/sys/unix/stack_overflow.rs index 340f9514241..bcbbb8766b7 100644 --- a/src/libstd/sys/unix/stack_overflow.rs +++ b/src/libstd/sys/unix/stack_overflow.rs @@ -160,7 +160,7 @@ mod imp { pub static SIGSTKSZ: libc::size_t = 8192; - pub static SIG_DFL: sighandler_t = 0i as sighandler_t; + pub const SIG_DFL: sighandler_t = 0i as sighandler_t; // This definition is not as accurate as it could be, {si_addr} is // actually a giant union. Currently we're only interested in that field, |