summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-02-18 06:33:53 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-02-18 06:33:53 +0000
commite6692012d9ab9063bc3af14514f2ddbbe6114ccd (patch)
tree34a62dfdcc989af80393f49d2fbb06ba93fc1321
parent7aa63a1550e52b23dd15ee7aaddc2c5d9b953d88 (diff)
downloadruby-e6692012d9ab9063bc3af14514f2ddbbe6114ccd.tar.gz
ruby-e6692012d9ab9063bc3af14514f2ddbbe6114ccd.tar.xz
ruby-e6692012d9ab9063bc3af14514f2ddbbe6114ccd.zip
* io.c (pipe_open): sarg is always used unless HAVE_FORK.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@22398 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--io.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 6c49dbb0b..f70050f96 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Feb 18 15:33:51 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * io.c (pipe_open): sarg is always used unless HAVE_FORK.
+
Wed Feb 18 15:23:34 2009 Akinori MUSHA <knu@iDaemons.org>
* bootstraptest/runner.rb: Use RUBY_DESCRIPTION if defined.
diff --git a/io.c b/io.c
index 3655d6135..2ed05b3d5 100644
--- a/io.c
+++ b/io.c
@@ -4511,9 +4511,9 @@ pipe_open(struct rb_exec_arg *eargp, VALUE prog, const char *modestr, int fmode,
#elif defined(_WIN32)
volatile VALUE argbuf;
char **args = NULL;
- struct rb_exec_arg sarg;
int pair[2], write_pair[2];
-#elif defined(__SYMBIAN32__)
+#endif
+#if !defined(HAVE_FORK)
struct rb_exec_arg sarg;
#endif
FILE *fp = 0;