summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-25 16:32:53 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-25 16:32:53 +0000
commit15023618ec2b3a04f9cd1022187b11672ea6b71d (patch)
tree4ef3f29238a51b7d0400aca2458f09f2045595e9
parentcc0c85e0c0c676b03f5e64e52df340e38c589648 (diff)
merges r20590 from trunk into ruby_1_9_1.
* vm_insnhelper.c (check_cfunc): use function pointer. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21055 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--vm_insnhelper.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index cc9f8aada9..32a4910ca5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Dec 9 13:23:18 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * vm_insnhelper.c (check_cfunc): use function pointer.
+
Thu Nov 27 10:40:52 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* ext/bigdecimal/bigdecimal.c (BigDecimal_div2): should return
diff --git a/vm_insnhelper.c b/vm_insnhelper.c
index 71a673e37e..28eaeb7951 100644
--- a/vm_insnhelper.c
+++ b/vm_insnhelper.c
@@ -1447,7 +1447,7 @@ vm_expandarray(rb_control_frame_t *cfp, VALUE ary, int num, int flag)
}
static inline int
-check_cfunc(const NODE *mn, const void *func)
+check_cfunc(const NODE *mn, VALUE (*func)())
{
if (mn && nd_type(mn->nd_body) == NODE_CFUNC &&
mn->nd_body->nd_cfnc == func) {