commit f4f6968a865a332def1ae5e16114538c741caf48
author Paul Bakker <p.j.bakker@polarssl.org> Sun Apr 24 16:08:12 2011 +0000
committer Paul Bakker <p.j.bakker@polarssl.org> Sun Apr 24 16:08:12 2011 +0000
tree 6e5ddd492c02e0dabe44e07e6d5206c2fa08179b
parent f4a3f301fd39c71c086d1e802fb25abc42b659d4

 - Improved compile-time compatibility with mingw32 64-bit versions

library/net.c

diff --git a/library/net.c b/library/net.c
index 378f798..5e811a5 100644
--- a/library/net.c
+++ b/library/net.c
@@ -40,8 +40,8 @@
 #pragma comment( lib, "ws2_32.lib" )
 #endif
 
-#define read(fd,buf,len)        recv(fd,buf,(int) len,0)
-#define write(fd,buf,len)       send(fd,buf,(int) len,0)
+#define read(fd,buf,len)        recv(fd,(char*)buf,(int) len,0)
+#define write(fd,buf,len)       send(fd,(char*)buf,(int) len,0)
 #define close(fd)               closesocket(fd)
 
 static int wsa_init_done = 0;
@@ -257,7 +257,7 @@
 int net_set_block( int fd )
 {
 #if defined(_WIN32) || defined(_WIN32_WCE)
-    long n = 0;
+    u_long n = 0;
     return( ioctlsocket( fd, FIONBIO, &n ) );
 #else
     return( fcntl( fd, F_SETFL, fcntl( fd, F_GETFL ) & ~O_NONBLOCK ) );
@@ -267,7 +267,7 @@
 int net_set_nonblock( int fd )
 {
 #if defined(_WIN32) || defined(_WIN32_WCE)
-    long n = 1;
+    u_long n = 1;
     return( ioctlsocket( fd, FIONBIO, &n ) );
 #else
     return( fcntl( fd, F_SETFL, fcntl( fd, F_GETFL ) | O_NONBLOCK ) );