matz	2007-10-04 16:53:32 +0900 (Thu, 04 Oct 2007)

  New Revision: 13617

  Modified files:
    trunk/ChangeLog
    trunk/io.c

  Log:
    * io.c (Init_IO): remove obsolete variables: $defout, $deferr.

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=13617&r2=13616
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/io.c?r1=13617&r2=13616

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 13616)
+++ ChangeLog	(revision 13617)
@@ -1,8 +1,10 @@
-Thu Oct  4 16:31:17 2007  Yukihiro Matsumoto  <matz@r...>
+Thu Oct  4 16:52:20 2007  Yukihiro Matsumoto  <matz@r...>
 
 	* re.c (kcode_setter): Perl-ish global variable `$=' no longer
 	  effective.
 
+	* io.c (Init_IO): remove obsolete variables: $defout, $deferr.
+
 Thu Oct  4 16:28:33 2007  Nobuyoshi Nakada  <nobu@r...>
 
 	* encoding.c (rb_obj_encoding): returns encoding of the given object.
Index: io.c
===================================================================
--- io.c	(revision 13616)
+++ io.c	(revision 13617)
@@ -4151,20 +4151,6 @@
     *variable = val;
 }
 
-static void
-defout_setter(VALUE val, ID id, VALUE *variable)
-{
-    stdout_setter(val, id, variable);
-    rb_warn("$defout is obsolete; use $stdout instead");
-}
-
-static void
-deferr_setter(VALUE val, ID id, VALUE *variable)
-{
-    stdout_setter(val, id, variable);
-    rb_warn("$deferr is obsolete; use $stderr instead");
-}
-
 static VALUE
 prep_io(int fd, int mode, VALUE klass, const char *path)
 {
@@ -5937,10 +5923,6 @@
     orig_stdout = rb_stdout;
     rb_deferr = orig_stderr = rb_stderr;
 
-    /* variables to be removed in 1.8.1 */
-    rb_define_hooked_variable("$defout", &rb_stdout, 0, defout_setter);
-    rb_define_hooked_variable("$deferr", &rb_stderr, 0, deferr_setter);
-
     /* constants to hold original stdin/stdout/stderr */
     rb_define_global_const("STDIN", rb_stdin);
     rb_define_global_const("STDOUT", rb_stdout);

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml