From 606fd78e9d9d7d99196327067877f1da30982dea Mon Sep 17 00:00:00 2001 From: shyouhei Date: Wed, 28 Jan 2009 11:59:58 +0000 Subject: merge revision(s) 19653: * marshal.c (marshal_dump): fixed for check_dump_arg. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@21851 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ marshal.c | 2 +- version.h | 8 ++++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 59a9165c11..0d0e96ea86 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Wed Jan 28 20:53:27 2009 Nobuyoshi Nakada + + * marshal.c (marshal_dump): fixed for check_dump_arg. + Tue Jan 27 17:29:05 2009 Nobuyoshi Nakada * marshal.c (marshal_dump): initializes dump_arg before any funcall. diff --git a/marshal.c b/marshal.c index 253b78a990..235a076529 100644 --- a/marshal.c +++ b/marshal.c @@ -790,7 +790,7 @@ marshal_dump(argc, argv) arg.dest = port; if (rb_respond_to(port, s_binmode)) { rb_funcall2(port, s_binmode, 0, 0); - check_dump_arg(&arg, s_dump_data); + check_dump_arg(&arg, s_binmode); } } else { diff --git a/version.h b/version.h index b8a261e0a1..daf5f8885c 100644 --- a/version.h +++ b/version.h @@ -1,15 +1,15 @@ #define RUBY_VERSION "1.8.6" -#define RUBY_RELEASE_DATE "2009-01-27" +#define RUBY_RELEASE_DATE "2009-01-28" #define RUBY_VERSION_CODE 186 -#define RUBY_RELEASE_CODE 20090127 -#define RUBY_PATCHLEVEL 312 +#define RUBY_RELEASE_CODE 20090128 +#define RUBY_PATCHLEVEL 313 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_TEENY 6 #define RUBY_RELEASE_YEAR 2009 #define RUBY_RELEASE_MONTH 1 -#define RUBY_RELEASE_DAY 27 +#define RUBY_RELEASE_DAY 28 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; -- cgit v1.2.3