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

* 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

View file

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