Proposed patch approved, with discussed changes to use SOCKET/closesocket unconditionally, anywhere but in the installed headers. (Don't forget to make sure port-sockets.h is included.)