* ext/socket/socket.c (Init_socket): remove obsolete constants:

  IPsocket, TCPsocket, SOCKSsocket, TCPserver, UDPsocket,
  UNIXsocket, UNIXserver.

* eval.c (formal_assign): post splat arguments should have had
  higher priority than optional arguments, since they are
  mandatory.  [ruby-dev:28715]

* eval.c (VIS_MASK): broken. should be 15.  [ruby-dev:28715]

* io.c (argf_getc): should return one-character string.
  [ruby-dev:28715]

* io.c (rb_io_readchar): ditto.


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@10257 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 2 insertions, 2 deletions

diff --git a/io.c b/io.c
index 9cd5d91d2..ff32f0816 100644
--- a/io.c
+++ b/io.c
@@ -2039,7 +2039,7 @@ rb_getc(FILE *f)
 static VALUE
 rb_io_readchar(VALUE io)
 {
-    VALUE c = rb_io_getc(io);
+    VALUE c = rb_io_getc_m(io);
 
     if (NIL_P(c)) {
 	rb_eof_error();
@@ -5356,7 +5356,7 @@ argf_getc(void)
 	ch = rb_funcall3(current_file, rb_intern("getc"), 0, 0);
     }
     else {
-	ch = rb_io_getc(current_file);
+	ch = rb_io_getc_m(current_file);
     }
     if (NIL_P(ch) && next_p != -1) {
 	argf_close(current_file);