From 1a61008f18e651ef8848813a34cdebd6d8fd5eba Mon Sep 17 00:00:00 2001 From: ocean Date: Fri, 21 Oct 2005 10:23:03 +0000 Subject: [PATCH] * rubysig.h (CHECK_INTS): fixed typo. (I believe bit-or is improper) git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9437 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ rubysig.h | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2f15bd72f9..0b34aa069f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Fri Oct 21 19:16:08 2005 Hirokazu Yamamoto + + * rubysig.h (CHECK_INTS): fixed typo. (I believe bit-or is improper) + Fri Oct 21 17:49:32 2005 Yukihiro Matsumoto * bin/erb (ERB::Main::run): typo fixed. [ruby-core:06337] diff --git a/rubysig.h b/rubysig.h index ac5519c13a..bce1c4f2aa 100644 --- a/rubysig.h +++ b/rubysig.h @@ -82,7 +82,7 @@ void rb_thread_schedule(void); #if defined(HAVE_SETITIMER) || defined(_THREAD_SAFE) RUBY_EXTERN int rb_thread_pending; # define CHECK_INTS do {\ - if (!(rb_prohibit_interrupt | rb_thread_critical)) {\ + if (!(rb_prohibit_interrupt || rb_thread_critical)) {\ if (rb_thread_pending) rb_thread_schedule();\ if (rb_trap_pending) rb_trap_exec();\ }\ @@ -92,10 +92,10 @@ RUBY_EXTERN int rb_thread_pending; RUBY_EXTERN int rb_thread_tick; #define THREAD_TICK 500 #define CHECK_INTS do {\ - if (!(rb_prohibit_interrupt | rb_thread_critical)) {\ + if (!(rb_prohibit_interrupt || rb_thread_critical)) {\ if (rb_thread_tick-- <= 0) {\ - rb_thread_tick = THREAD_TICK; - rb_thread_schedule(); + rb_thread_tick = THREAD_TICK;\ + rb_thread_schedule();\ }\ }\ if (rb_trap_pending) rb_trap_exec();\