aboutsummaryrefslogtreecommitdiffstats
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
commit30231731a9539e8b3474bd3ffa8e24624ea726d1 (patch)
tree34a62dfdcc989af80393f49d2fbb06ba93fc1321
parentfd2b650d068779887bd794e0097c081a6c70763e (diff)
downloadruby-30231731a9539e8b3474bd3ffa8e24624ea726d1.tar.gz
* io.c (pipe_open): sarg is always used unless HAVE_FORK.
git-svn-id: svn+ssh://ci.ruby-lang.org/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 6c49dbb0bc..f70050f96f 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 3655d61353..2ed05b3d56 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;