summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-15 02:41:38 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-15 02:41:38 +0000
commit4430438c66596f0eb1d2db1d9368b1cb5e0c66ee (patch)
tree46fd6ef7bf293077dfaad3ec7c4670cbda30f55b
parent5932de4991e48ffcae71be6885ecdf9f10dd8f02 (diff)
* io.c (pipe_open): revert a part of previous commit. it may be a
mistake. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21515 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--io.c9
2 files changed, 8 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 1b01b50b03..9040e045c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jan 15 11:40:44 2009 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * io.c (pipe_open): revert a part of previous commit. it may be a
+ mistake.
+
Thu Jan 15 10:45:52 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
* symbian/README.SYMBIAN: symbian support added. great appreciate
diff --git a/io.c b/io.c
index a70baf8edf..14fb46bcdc 100644
--- a/io.c
+++ b/io.c
@@ -4479,12 +4479,9 @@ pipe_open(struct rb_exec_arg *eargp, VALUE prog, const char *modestr, int fmode,
int status;
struct popen_arg arg;
char errmsg[80] = { '\0' };
-#else
-#if defined(_WIN32)
- int openmode = rb_io_modestr_oflags(modestr);
- const char *exename = NULL;
- volatile VALUE cmdbuf;
-#endif
+#elif defined(_WIN32)
+ volatile VALUE argbuf;
+ char **args = NULL;
struct rb_exec_arg sarg;
int pair[2], write_pair[2];
#endif