summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-10-21 10:23:03 +0000
committerocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-10-21 10:23:03 +0000
commite9950cd3e94ed8b8444eb6c600cb72af065c415e (patch)
tree32b44fbbd22da991e37893d0d93f05c0af98be38
parent97c875ef97a9da31c23e6b7236d1d6b815df3b71 (diff)
downloadruby-e9950cd3e94ed8b8444eb6c600cb72af065c415e.tar.gz
ruby-e9950cd3e94ed8b8444eb6c600cb72af065c415e.tar.xz
ruby-e9950cd3e94ed8b8444eb6c600cb72af065c415e.zip
* rubysig.h (CHECK_INTS): fixed typo. (I believe bit-or is improper)
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@9437 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--rubysig.h4
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 5e1de6c19..c0c3c53c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Oct 21 19:21:56 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+
+ * rubysig.h (CHECK_INTS): fixed typo. (I believe bit-or is improper)
+
Fri Oct 21 15:27:17 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* bignum.c (bignew_1): convertion from `int' to `char' discards
diff --git a/rubysig.h b/rubysig.h
index 6b55e93d3..f71682487 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,7 +92,7 @@ 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();\