summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-28 12:12:07 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-28 12:12:07 +0000
commitcac277075356946b9eb4f9f0f2fe63eb6a90d0c9 (patch)
tree0533f3ea6b0651e1f011f5f6035f6c84b6f7f6aa
parent6197ef054059dbbf12cdd671c5b82f9ea75c91de (diff)
downloadruby-cac277075356946b9eb4f9f0f2fe63eb6a90d0c9.tar.gz
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_7@21853 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--marshal.c2
-rw-r--r--version.h8
3 files changed, 9 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index e4472c5971..c521d4ec68 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Jan 28 20:53:27 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * marshal.c (marshal_dump): fixed for check_dump_arg.
+
Tue Jan 27 17:30:11 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* marshal.c (marshal_dump): initializes dump_arg before any funcall.
diff --git a/marshal.c b/marshal.c
index f1a191568d..69e730ee5d 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 10f3d3c6a2..9fe33e080a 100644
--- a/version.h
+++ b/version.h
@@ -1,15 +1,15 @@
#define RUBY_VERSION "1.8.7"
-#define RUBY_RELEASE_DATE "2009-01-27"
+#define RUBY_RELEASE_DATE "2009-01-28"
#define RUBY_VERSION_CODE 187
-#define RUBY_RELEASE_CODE 20090127
-#define RUBY_PATCHLEVEL 98
+#define RUBY_RELEASE_CODE 20090128
+#define RUBY_PATCHLEVEL 99
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8
#define RUBY_VERSION_TEENY 7
#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[];