Skip to content

Commit 690c315

Browse files
committed
---
yaml --- r: 50494 b: refs/heads/auto c: 4f1d8cb h: refs/heads/master v: v3
1 parent e8fe9d1 commit 690c315

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
1414
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1515
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1616
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
17-
refs/heads/auto: fdf48a7b52de948b3ec4ba187539a6164a56edcb
17+
refs/heads/auto: 4f1d8cb6fce625d13baf12f49e41d29f1433c8dd
1818
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167

branches/auto/src/rt/sync/rust_thread.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111

1212
#include "rust_thread.h"
13+
#include <limits.h>
1314

1415
const size_t default_stack_sz = 1024*1024;
1516

@@ -41,6 +42,8 @@ rust_thread::start() {
4142
#if defined(__WIN32__)
4243
thread = CreateThread(NULL, stack_sz, rust_thread_start, this, 0, NULL);
4344
#else
45+
// PTHREAD_STACK_MIN of some system is larger than default size
46+
// so we check stack_sz to prevent assertion failure.
4447
if (stack_sz < PTHREAD_STACK_MIN) {
4548
stack_sz = PTHREAD_STACK_MIN;
4649
}

0 commit comments

Comments
 (0)