summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-08-15 20:56:18 (GMT)
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-08-15 20:56:18 (GMT)
commit9050c9179deb892435480d73ca9f0e1fb1c002c4 (patch)
tree67af7984ad917efba826a815f7969ae8c8eeef08
parentcda9fb900bc7e26d1b0170c316bca310252e6586 (diff)
parentd10ee17ba71098ed3b372d337eb8d42a158550b8 (diff)
sorry. I made wrong tags.v1_8_5_60
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/tags/v1_8_5_60@13004 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--process.c7
-rw-r--r--version.h2
3 files changed, 3 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 8492394..5b46009 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,3 @@
-Thu Aug 16 04:34:56 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * process.c (proc_exec_v, rb_proc_exec): preserve errno.
-
Thu Aug 16 04:30:45 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* variable.c (rb_path2class): get rid of dangling pointer caused by
diff --git a/process.c b/process.c
index 00b557b..6064cd1 100644
--- a/process.c
+++ b/process.c
@@ -117,9 +117,6 @@ static VALUE S_Tms;
#endif
#endif
-#define preserving_errno(stmts) \
- do {int saved_errno = errno; stmts; errno = saved_errno;} while (0)
-
/*
* call-seq:
@@ -992,7 +989,7 @@ proc_exec_v(argv, prog)
#endif /* MSDOS or __human68k__ or __EMX__ */
before_exec();
execv(prog, argv);
- preserving_errno(after_exec());
+ after_exec();
return -1;
}
@@ -1061,7 +1058,7 @@ rb_proc_exec(str)
#else
before_exec();
execl("/bin/sh", "sh", "-c", str, (char *)NULL);
- preserving_errno(after_exec());
+ after_exec();
#endif
#endif
return -1;
diff --git a/version.h b/version.h
index e122209..80f9095 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
#define RUBY_RELEASE_DATE "2007-08-16"
#define RUBY_VERSION_CODE 185
#define RUBY_RELEASE_CODE 20070816
-#define RUBY_PATCHLEVEL 61
+#define RUBY_PATCHLEVEL 60
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8