summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>1998-08-11 04:06:30 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>1998-08-11 04:06:30 +0000
commit876cb9610bfaa73776bcdbf4884a1ba5fd9df361 (patch)
tree2038d868f3740dd23240fdc70b066a4561469837
parent0993256fa0bf6e917dd5b20f26237ae11764504e (diff)
*** empty log message ***
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/v1_1r@284 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--io.c3
-rw-r--r--version.h2
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index b1f9ccacb54..b97350b743c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Aug 11 11:57:35 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
+
+ * version 1.1c2 released.
+
Mon Aug 10 14:05:30 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
* process.c (f_system): removed fflush(stdin).
diff --git a/io.c b/io.c
index 9d5bbc56563..a9fdf97b2b4 100644
--- a/io.c
+++ b/io.c
@@ -1991,7 +1991,8 @@ f_select(argc, argv, obj)
int interrupt = 0;
int pending = 0;
- if (rb_scan_args(argc, argv, "13", &read, &write, &except, &timeout)<4) {
+ rb_scan_args(argc, argv, "13", &read, &write, &except, &timeout);
+ if (NIL_P(timeout)) {
tp = NULL;
}
else {
diff --git a/version.h b/version.h
index dccc5e6ef20..5f8d1a01678 100644
--- a/version.h
+++ b/version.h
@@ -1,2 +1,2 @@
#define RUBY_VERSION "1.1c2"
-#define VERSION_DATE "98/08/10"
+#define VERSION_DATE "98/08/11"