From 81b5dcb2a11f8a032cdb859f24937d08022ef8a4 Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 16 Aug 2006 08:47:18 +0000 Subject: [PATCH] * marshal.c (r_byte): IO#getc returns one byte string now. fixed: [ruby-dev:29255] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10735 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ marshal.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 415419e4c5..2c5aa0778d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Aug 16 17:46:59 2006 Nobuyoshi Nakada + + * marshal.c (r_byte): IO#getc returns one byte string now. + fixed: [ruby-dev:29255] + Wed Aug 16 17:22:44 2006 NAKAMURA Usaku * common.mk (pre-install-local): remove unnecessary code. diff --git a/marshal.c b/marshal.c index 1e6f8926a2..aa6a5943d8 100644 --- a/marshal.c +++ b/marshal.c @@ -757,7 +757,7 @@ r_byte(struct load_arg *arg) VALUE src = arg->src; VALUE v = rb_funcall2(src, s_getc, 0, 0); if (NIL_P(v)) rb_eof_error(); - c = (unsigned char)FIX2INT(v); + c = (unsigned char)NUM2CHR(v); } return c; }