archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-19 10:33:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merge revision(s) 56310: [Backport #13364]

Browse source 
* win32/win32.c (poll_child_status): rb_w32_wait_events_blocking() sets
	  errno internally, then should not set it here.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@58109 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2017-03-25 17:32:17 +00:00
parent f60e5af02d
commit 8c34c05d24
3 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Sun Mar 26 02:32:12 2017 NAKAMURA Usaku <usa@ruby-lang.org>
* win32/win32.c (poll_child_status): rb_w32_wait_events_blocking() sets
errno internally, then should not set it here.
Sun Mar 26 02:13:04 2017 Koichi Sasada <ko1@atdot.net> Sun Mar 26 02:13:04 2017 Koichi Sasada <ko1@atdot.net>
* test/ruby/test_exception.rb: fix thread issues. * test/ruby/test_exception.rb: fix thread issues.

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.2.7" #define RUBY_VERSION "2.2.7"
#define RUBY_RELEASE_DATE "2017-03-26" #define RUBY_RELEASE_DATE "2017-03-26"
#define RUBY_PATCHLEVEL 441 #define RUBY_PATCHLEVEL 442
#define RUBY_RELEASE_YEAR 2017 #define RUBY_RELEASE_YEAR 2017
#define RUBY_RELEASE_MONTH 3 #define RUBY_RELEASE_MONTH 3

2
win32/win32.c
View file

@ -4172,7 +4172,6 @@ poll_child_status(struct ChildRecord *child, int *stat_loc)
if (!GetExitCodeProcess(child->hProcess, &exitcode)) { if (!GetExitCodeProcess(child->hProcess, &exitcode)) {
/* If an error occurred, return immediately. */ /* If an error occurred, return immediately. */
error_exit:
err = GetLastError(); err = GetLastError();
switch (err) { switch (err) {
case ERROR_INVALID_PARAMETER: case ERROR_INVALID_PARAMETER:
@ -4185,6 +4184,7 @@ poll_child_status(struct ChildRecord *child, int *stat_loc)
errno = map_errno(err); errno = map_errno(err);
break; break;
} }
error_exit:
CloseChildHandle(child); CloseChildHandle(child);
return -1; return -1;
} }