From 5a4c8a1ad7c3e700001714db6952e215cd4df06b Mon Sep 17 00:00:00 2001 From: matz Date: Tue, 15 Apr 2008 10:21:01 +0000 Subject: * io.c: #undef rb_argv moved before #define. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16040 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ io.c | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 91eb86565f..1a03df7fce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Tue Apr 15 19:20:14 2008 Yukihiro Matsumoto + + * io.c: #undef rb_argv moved before #define. + Tue Apr 15 18:02:17 2008 Nobuyoshi Nakada * include/ruby/intern.h (rb_argv): replaced with rb_get_argv(). diff --git a/io.c b/io.c index 59fd378618..9524894ea3 100644 --- a/io.c +++ b/io.c @@ -5037,6 +5037,7 @@ argf_alloc(VALUE klass) return argf; } +#undef rb_argv #define filename ARGF.filename #define current_file ARGF.current_file #define gets_lineno ARGF.gets_lineno @@ -7244,8 +7245,6 @@ rb_get_argv(void) return rb_argv; } -#undef rb_argv - /* * Class IO is the basis for all input and output in Ruby. * An I/O stream may be duplexed (that is, bidirectional), and -- cgit v1.2.3