Fix build
Merge remote-tracking branch 'origin/win32' into win32-fix-for-read-and-write

Conflicts:
	src/socket.c