summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--vm_method.c8
2 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 2ad2896d5f..4b4770430e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Jan 14 23:25:55 2011 Tanaka Akira <akr@fsij.org>
+
+ * vm_method.c: parenthesize macro arguments.
+
Fri Jan 14 15:32:29 2011 Shugo Maeda <shugo@ruby-lang.org>
* test/net/imap/test_imap.rb: call neither logout nor disconnect
diff --git a/vm_method.c b/vm_method.c
index fa5738b5cb..f7b7534830 100644
--- a/vm_method.c
+++ b/vm_method.c
@@ -285,10 +285,10 @@ rb_method_entry_make(VALUE klass, ID mid, rb_method_type_t type,
#define CALL_METHOD_HOOK(klass, hook, mid) do { \
const VALUE arg = ID2SYM(mid); \
- VALUE recv_class = klass; \
- ID hook_id = hook; \
- if (FL_TEST(klass, FL_SINGLETON)) { \
- recv_class = rb_ivar_get(klass, attached); \
+ VALUE recv_class = (klass); \
+ ID hook_id = (hook); \
+ if (FL_TEST((klass), FL_SINGLETON)) { \
+ recv_class = rb_ivar_get((klass), attached); \
hook_id = singleton_##hook; \
} \
rb_funcall2(recv_class, hook_id, 1, &arg); \