From: Maksym Veremeyenko <verem@m1stereo.tv>
Date: Mon, 9 Jul 2012 22:02:28 +0000 (+0300)
Subject: adopt to winsock
X-Git-Url: http://research.m1stereo.tv/gitweb?a=commitdiff_plain;p=melted

adopt to winsock
---

diff --git a/src/mvcp/mvcp_socket.c b/src/mvcp/mvcp_socket.c
index 2052499..c66b0b6 100644
--- a/src/mvcp/mvcp_socket.c
+++ b/src/mvcp/mvcp_socket.c
@@ -116,7 +116,11 @@ int mvcp_socket_read_data( mvcp_socket socket, char *data, int length )
 
 	if ( select( socket->fd + 1, &rfds, NULL, NULL, &tv ) )
 	{
+#if defined(__MINGW32__)
+		used = recv( socket->fd, data, length - 1, 0 );
+#else
 		used = read( socket->fd, data, length - 1 );
+#endif
 		if ( used > 0 )
 			data[ used ] = '\0';
 		else
@@ -157,7 +161,11 @@ int mvcp_socket_write_data( mvcp_socket socket, const char *data, int length )
 			}
 			else if ( FD_ISSET( socket->fd, &wfds ) )
 			{
+#if defined(__MINGW32__)
+				int inc = send( socket->fd, data + used, length - used, 0 );
+#else
 				int inc = write( socket->fd, data + used, length - used );
+#endif
 				if ( inc > 0 )
 					used += inc;
 				else
@@ -175,7 +183,11 @@ int mvcp_socket_write_data( mvcp_socket socket, const char *data, int length )
 void mvcp_socket_close( mvcp_socket socket )
 {
 	if ( socket->fd > 0 && !socket->no_close )
+#if defined(__MINGW32__)
+		closesocket( socket->fd );
+#else
 		close( socket->fd );
+#endif
 	free( socket->server );
 	free( socket );
 }