summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--vm_core.h6
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index fe4e4fe614..b30d43d93e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Apr 1 13:19:20 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * vm_core.h (RUBY_VM_CHECK_INTS_TH): merge a patch by ko1
+ in [ruby-dev:43373].
+
Thu Mar 31 23:15:46 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
* misc/ruby-mode.el (ruby-brace-to-do-end, ruby-do-end-to-brace):
diff --git a/vm_core.h b/vm_core.h
index 257bdce668..c5417d9381 100644
--- a/vm_core.h
+++ b/vm_core.h
@@ -703,9 +703,9 @@ void rb_thread_lock_unlock(rb_thread_lock_t *);
void rb_thread_lock_destroy(rb_thread_lock_t *);
#define RUBY_VM_CHECK_INTS_TH(th) do { \
- if (UNLIKELY((th)->interrupt_flag)) { \
- rb_threadptr_execute_interrupts(th); \
- } \
+ if (UNLIKELY((th)->interrupt_flag)) { \
+ rb_threadptr_execute_interrupts(th); \
+ } \
} while (0)
#define RUBY_VM_CHECK_INTS() \