summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoreban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-10-21 04:16:40 +0000
committereban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-10-21 04:16:40 +0000
commit323953b26f8f3ff514f981638503beecc938db9b (patch)
tree81e0822a43e29490df25352ee3a2a166e9159b70
parentee7ccccefb5309ea2de6861b4c5754b1e9c485ac (diff)
downloadruby-323953b26f8f3ff514f981638503beecc938db9b.tar.gz
ruby-323953b26f8f3ff514f981638503beecc938db9b.tar.xz
ruby-323953b26f8f3ff514f981638503beecc938db9b.zip
* 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
-rw-r--r--ChangeLog4
-rw-r--r--io.c6
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 <eban@ruby-lang.org>
+
+ * io.c (pipe_open): variable name "fpw" is conflicted.
+
Thu Oct 21 00:36:41 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* 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;