* eval.c (thread_timer): use timer by sub-thread and nanosleep.

  [ruby-talk:87519]

* gc.c (Init_stack): no stack adjustment for THREAD_SAFE.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5184 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 2 insertions, 5 deletions

diff --git a/gc.c b/gc.c
index 8aab6cc4f6..8d337cd57a 100644
--- a/gc.c
+++ b/gc.c
@@ -423,11 +423,11 @@ stack_growup_p(addr)
 # define STACK_UPPER(x, a, b) (stack_growup_p(x) ? a : b)
 #endif
 
-#define GC_WARTER_MARK 512
+#define GC_WATER_MARK 512
 
 #define CHECK_STACK(ret) do {\
     SET_STACK_END;\
-    (ret) = (STACK_LENGTH > STACK_LEVEL_MAX + GC_WARTER_MARK);\
+    (ret) = (STACK_LENGTH > STACK_LEVEL_MAX + GC_WATER_MARK);\
 } while (0)
 
 int
@@ -1393,9 +1393,6 @@ Init_stack(addr)
     if (STACK_LEVEL_MAX > IA64_MAGIC_STACK_LIMIT)
 	STACK_LEVEL_MAX = IA64_MAGIC_STACK_LIMIT;
 #endif
-#ifdef _THREAD_SAFE
-    STACK_LEVEL_MAX /= 4;
-#endif
 #endif
 }