shyouhei	2008-06-15 23:16:05 +0900 (Sun, 15 Jun 2008)

  New Revision: 17317

  Modified files:
    branches/ruby_1_8_5/ChangeLog
    branches/ruby_1_8_5/eval.c
    branches/ruby_1_8_5/marshal.c
    branches/ruby_1_8_5/version.h

  Log:
    merge revision(s) 16564:
    * marshal.c (reentrant_check): check reentrance via callcc.
      [ruby-dev:34802]


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/marshal.c?r1=17317&r2=17316&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/version.h?r1=17317&r2=17316&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/ChangeLog?r1=17317&r2=17316&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/eval.c?r1=17317&r2=17316&diff_format=u