Small issue in errors.pyx seems resolved.

Skipping uverr == uv.UV_ECANCELED test no longer needed. Also drop spurious WIN32_LEAN_AND_MEAN define.
Vizonex · Jul 7, 2024 · f1b492f · f1b492f
1 parent 2bc04e3
commit f1b492f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/winloop/errors.pyx b/winloop/errors.pyx
@@ -64,12 +64,8 @@ cdef int __convert_socket_error(int uverr):
 cdef convert_error(int uverr):
     cdef int sock_err
 
-# Winloop comment: The next two lines are used in uvloop:
-#    if uverr == uv.UV_ECANCELED:
-#        return aio_CancelledError()
-# Deleting these lines needed to pass test_aiohttp_graceful_shutdown (test_aiohttp.Test_AIO_AioHTTP)
-# And deleting these lines does not seem to cause any other issues on Windows.
-# TODO: find out why these lines are needed on Linux?
+    if uverr == uv.UV_ECANCELED:
+        return aio_CancelledError()
 
     sock_err = __convert_socket_error(uverr)
     if sock_err:

diff --git a/winloop/includes/compat.h b/winloop/includes/compat.h
@@ -6,9 +6,6 @@
 #include <arpa/inet.h>
 #include <unistd.h>
 #else
-#ifndef WIN32_LEAN_AND_MEAN
-#define WIN32_LEAN_AND_MEAN
-#endif
 #include <io.h>
 #include <winsock2.h>
 #endif