@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2008-2021 Jonathan Schleifer <js@nil.im>
+ * Copyright (c) 2008-2022 Jonathan Schleifer <js@nil.im>
  *
  * All rights reserved.
  *
  * This file is part of ObjFW. It may be distributed under the terms of the
  * Q Public License 1.0, which can be found in the file LICENSE.QPL included in
@@ -81,11 +81,11 @@
 			OFEnsure(0);
 	} else {
 #endif
 		if ([_delegate respondsToSelector:
 		    @selector(socket:didConnectToHost:port:exception:)])
-			[_delegate socket: _socket
+			[_delegate    socket: _socket
 			    didConnectToHost: _host
 					port: _port
 				   exception: _exception];
 #ifdef OF_HAVE_BLOCKS
 	}
@@ -178,11 +178,15 @@
 	[_socket setCanBlock: false];
 #endif
 
 	if (![_socket of_connectSocketToAddress: &address errNo: &errNo]) {
 #if !defined(OF_NINTENDO_3DS) && !defined(OF_WII)
+# ifdef OF_WINDOWS
+		if (errNo == EINPROGRESS || errNo == EWOULDBLOCK) {
+# else
 		if (errNo == EINPROGRESS) {
+# endif
 			[OFRunLoop of_addAsyncConnectForSocket: _socket
 							  mode: runLoopMode
 						      delegate: self];
 			return;
 		} else {