changeset:   95339:8ec4acfdb851
user:        Victor Stinner <victor.stinner@gmail.com>
date:        Wed Apr 01 11:09:43 2015 +0200
files:       Modules/socketmodule.c
description:
Issue #23618: Fix EINTR handling on Windows

Windows uses WSAEINTR error code, not EINTR, for socket functions.


diff -r 87af6deb5d26 -r 8ec4acfdb851 Modules/socketmodule.c
--- a/Modules/socketmodule.c	Tue Mar 31 21:21:09 2015 -0400
+++ b/Modules/socketmodule.c	Wed Apr 01 11:09:43 2015 +0200
@@ -2476,7 +2476,7 @@
     }
 
     err = GET_ERROR;
-    if (err == EINTR && PyErr_CheckSignals())
+    if (CHECK_ERRNO(EINTR) && PyErr_CheckSignals())
         return -1;
 
     wait_connect = (s->sock_timeout > 0 && err == IN_PROGRESS_ERR
@@ -2488,7 +2488,7 @@
     if (timeout == -1) {
         /* select() failed */
         err = GET_ERROR;
-        if (err == EINTR && PyErr_CheckSignals())
+        if (CHECK_ERRNO(EINTR) && PyErr_CheckSignals())
             return -1;
         return err;
     }