summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-12-08 08:09:24 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-12-08 08:09:24 +0000
commitb62f04f5e10cebb1539667c343e136cc69434233 (patch)
treeed9c639f3b02118dd6953d1605926f9ce8425917
parent1f87ac7b87803c9493336dfd5fe587f44c9f8919 (diff)
merges r29743 from trunk into ruby_1_9_2.
-- * io.c (pipe_finalize): status is success if no process. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30135 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--io.c2
-rw-r--r--version.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/io.c b/io.c
index 131bcf46a5..79c3024538 100644
--- a/io.c
+++ b/io.c
@@ -4793,7 +4793,7 @@ static void
pipe_finalize(rb_io_t *fptr, int noraise)
{
#if !defined(HAVE_FORK) && !defined(_WIN32)
- int status;
+ int status = 0;
if (fptr->stdio_file) {
status = pclose(fptr->stdio_file);
}
diff --git a/version.h b/version.h
index 630576b660..6ee4d69c66 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 89
+#define RUBY_PATCHLEVEL 90
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 1