Skip to content
Closed
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix bad rebase
  • Loading branch information
ameily committed May 2, 2019
commit 4211be9ed295125c2720f4fa863fcd49b5bbb05b
2 changes: 0 additions & 2 deletions Modules/overlapped.c
Original file line number Diff line number Diff line change
Expand Up @@ -661,7 +661,6 @@ unparse_address(LPSOCKADDR Address, DWORD Length)
char AddressString[40];
unsigned int port;
PVOID pSinAddr;
DWORD err;

switch(Address->sa_family) {
case AF_INET:
Expand Down Expand Up @@ -1653,7 +1652,6 @@ Overlapped_WSARecvFrom(OverlappedObject *self, PyObject *args)
self->type = TYPE_NOT_STARTED;
return SetFromWindowsErr(err);
}
>>>>>>> bpo-29883: Add UDP to Windows Proactor Event Loop
}


Expand Down