From 0d83f5c6ca5cc212dc03e75c4802734ea911196b Mon Sep 17 00:00:00 2001 From: yugui Date: Fri, 30 Jan 2009 01:46:22 +0000 Subject: merges r21686 from trunk into ruby_1_9_1. * cont.c (ruby_Init_{Continuation_body,Fiber_as_Coroutine}): prefixed with ruby_ to export. * ext/continuation/continuation.c, ext/fiber/fiber.c: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21886 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 7 +++++++ cont.c | 4 ++-- ext/continuation/continuation.c | 4 ++-- ext/fiber/fiber.c | 4 ++-- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 017c80b8fb..727f5bb36b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Tue Jan 20 16:17:12 2009 Nobuyoshi Nakada + + * cont.c (ruby_Init_{Continuation_body,Fiber_as_Coroutine}): prefixed + with ruby_ to export. + + * ext/continuation/continuation.c, ext/fiber/fiber.c: ditto. + Thu Jan 29 16:22:41 2009 Shugo Maeda * load.c (rb_feature_provided): should not calculate len by pointer diff --git a/cont.c b/cont.c index 5e5e8d50a0..ab6c79b71b 100644 --- a/cont.c +++ b/cont.c @@ -1003,7 +1003,7 @@ Init_Cont(void) } void -Init_Continuation_body(void) +ruby_Init_Continuation_body(void) { rb_cContinuation = rb_define_class("Continuation", rb_cObject); rb_undef_alloc_func(rb_cContinuation); @@ -1014,7 +1014,7 @@ Init_Continuation_body(void) } void -Init_Fiber_as_Coroutine(void) +ruby_Init_Fiber_as_Coroutine(void) { rb_define_method(rb_cFiber, "transfer", rb_fiber_m_transfer, -1); rb_define_method(rb_cFiber, "alive?", rb_fiber_alive_p, 0); diff --git a/ext/continuation/continuation.c b/ext/continuation/continuation.c index a1b43b5047..ae69b66cd8 100644 --- a/ext/continuation/continuation.c +++ b/ext/continuation/continuation.c @@ -1,8 +1,8 @@ -void Init_Continuation_body(void); +void ruby_Init_Continuation_body(void); void Init_continuation(void) { - Init_Continuation_body(); + ruby_Init_Continuation_body(); } diff --git a/ext/fiber/fiber.c b/ext/fiber/fiber.c index 7c33a1f231..12fcaad73b 100644 --- a/ext/fiber/fiber.c +++ b/ext/fiber/fiber.c @@ -1,8 +1,8 @@ -void Init_Fiber_as_Coroutine(void); +void ruby_Init_Fiber_as_Coroutine(void); void Init_fiber(void) { - Init_Fiber_as_Coroutine(); + ruby_Init_Fiber_as_Coroutine(); } -- cgit v1.2.3