diff options
| author | bors <bors@rust-lang.org> | 2015-03-01 06:32:54 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-03-01 06:32:54 +0000 |
| commit | 0905c8a5ec856a6b972fcb239df2b8f6e82d2418 (patch) | |
| tree | dae5d3ebde7eaaeeaad8b0e67bfb835b33fb5258 /src/libstd | |
| parent | 341a9ca1e324d7b7427334b32e99e6d8bc82e9a6 (diff) | |
| parent | 60f7732ccd9b0ad50490457ddd02a4a48cf74e74 (diff) | |
| download | rust-0905c8a5ec856a6b972fcb239df2b8f6e82d2418.tar.gz rust-0905c8a5ec856a6b972fcb239df2b8f6e82d2418.zip | |
Auto merge of #22909 - Manishearth:rollup, r=Manishearth
r? @Manishearth
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/sys/unix/thread.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/sys/unix/thread.rs b/src/libstd/sys/unix/thread.rs index f4791d39da1..827e2afdca8 100644 --- a/src/libstd/sys/unix/thread.rs +++ b/src/libstd/sys/unix/thread.rs @@ -164,7 +164,7 @@ pub mod guard { if pthread_main_np() == 1 { // main thread - current_stack.ss_sp as uint - current_stack.ss_size as uint + 3 * PAGE_SIZE as uint + current_stack.ss_sp as uint - current_stack.ss_size as uint + PAGE_SIZE as uint } else { // new thread |