shyouhei	2008-06-13 13:12:35 +0900 (Fri, 13 Jun 2008)

  New Revision: 17138

  Modified files:
    branches/ruby_1_8_5/ChangeLog
    branches/ruby_1_8_5/ext/dl/ptr.c
    branches/ruby_1_8_5/gc.c
    branches/ruby_1_8_5/version.h

  Log:
    merge revision(s) 15429, 15471:
    * gc.c (rb_newobj): prohibit call of rb_newobj() during gc.
      Submitted by Sylvain Joyeux [ruby-core:12099].
    * ext/dl/ptr.c: do not use LONG2NUM() inside dlptr_free().
      Slightly modified fix bassed on a patch by Sylvain Joyeux
      [ruby-core:12099] [ ruby-bugs-11859 ] [ ruby-bugs-11882 ]
      [ ruby-patches-13151 ].
    * ext/dl/ptr.c (dlmem_each_i): typo fixed.  a patch from IKOMA
      Yoshiki <ikoma mb.i-chubu.ne.jp> in [ruby-dev:33776].


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/ext/dl/ptr.c?r1=17138&r2=17137&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/version.h?r1=17138&r2=17137&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/ChangeLog?r1=17138&r2=17137&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/gc.c?r1=17138&r2=17137&diff_format=u