From 323953b26f8f3ff514f981638503beecc938db9b Mon Sep 17 00:00:00 2001 From: eban Date: Thu, 21 Oct 2004 04:16:40 +0000 Subject: * io.c (pipe_open): variable name "fpw" is conflicted. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@7093 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ io.c | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 19031b37f..8dbcc3fd2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Thu Oct 21 13:11:31 2004 WATANABE Hirofumi + + * io.c (pipe_open): variable name "fpw" is conflicted. + Thu Oct 21 00:36:41 2004 Yukihiro Matsumoto * parse.y (lex_getline): should not touch ruby_debug_lines if diff --git a/io.c b/io.c index 2dc89cbeb..460973ff2 100644 --- a/io.c +++ b/io.c @@ -2876,9 +2876,9 @@ pipe_open(argc, argv, pname, mode) fptr->f = PIPE_FDOPEN(0); } if (modef & FMODE_WRITABLE) { - FILE *fpw = PIPE_FDOPEN(1); - if (fptr->f) fptr->f2 = fpw; - else fptr->f = fpw; + FILE *fpwt = PIPE_FDOPEN(1); + if (fptr->f) fptr->f2 = fpwt; + else fptr->f = fpwt; } #if defined (__CYGWIN__) || !defined(HAVE_FORK) fptr->finalize = pipe_finalize; -- cgit