diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-30 01:46:22 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-30 01:46:22 +0000 |
commit | 0d83f5c6ca5cc212dc03e75c4802734ea911196b (patch) | |
tree | 6f739f2cc45ca10a7fc91f1276405933fe86094b | |
parent | c170e90249121a1b347d2d6f6303dc51b3495232 (diff) |
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
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | cont.c | 4 | ||||
-rw-r--r-- | ext/continuation/continuation.c | 4 | ||||
-rw-r--r-- | ext/fiber/fiber.c | 4 |
4 files changed, 13 insertions, 6 deletions
@@ -1,3 +1,10 @@ +Tue Jan 20 16:17:12 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * 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 <shugo@ruby-lang.org> * load.c (rb_feature_provided): should not calculate len by pointer @@ -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(); } |