usa	2017-03-26 02:32:17 +0900 (Sun, 26 Mar 2017)

  New Revision: 58109

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=58109

  Log:
    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.

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/version.h
    branches/ruby_2_2/win32/win32.c
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 58108)
+++ ruby_2_2/version.h	(revision 58109)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.7"
 #define RUBY_RELEASE_DATE "2017-03-26"
-#define RUBY_PATCHLEVEL 441
+#define RUBY_PATCHLEVEL 442
 
 #define RUBY_RELEASE_YEAR 2017
 #define RUBY_RELEASE_MONTH 3
Index: ruby_2_2/win32/win32.c
===================================================================
--- ruby_2_2/win32/win32.c	(revision 58108)
+++ ruby_2_2/win32/win32.c	(revision 58109)
@@ -4172,7 +4172,6 @@ poll_child_status(struct ChildRecord *ch https://github.com/ruby/ruby/blob/trunk/ruby_2_2/win32/win32.c#L4172
 
     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 *ch https://github.com/ruby/ruby/blob/trunk/ruby_2_2/win32/win32.c#L4184
 	    errno = map_errno(err);
 	    break;
 	}
+    error_exit:
 	CloseChildHandle(child);
 	return -1;
     }
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 58108)
+++ ruby_2_2/ChangeLog	(revision 58109)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Sun Mar 26 02:32:12 2017  NAKAMURA Usaku  <usa@r...>
+
+	* 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@a...>
 
 	* test/ruby/test_exception.rb: fix thread issues.

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r56310


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/