Francois Gouget : wininet & winhttp: Fix a pointer type mismatch warning when compiling on Windows. On Windows setsockopt() expects a char* while on Unix it accepts anything.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: c1b2008d0cd0e866b683966dd2adf33551a7c6ef
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=c1b2008d0cd0e866b683966dd2...

Author: Francois Gouget <fgouget(a)free.fr>
Date:   Mon Dec  8 09:28:43 2008 +0100

wininet & winhttp: Fix a pointer type mismatch warning when compiling on Windows. On Windows setsockopt() expects a char* while on Unix it accepts anything.

---

 dlls/winhttp/net.c           |    2 +-
 dlls/wininet/netconnection.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c
index b343050..e9e12f7 100644
--- a/dlls/winhttp/net.c
+++ b/dlls/winhttp/net.c
@@ -558,7 +558,7 @@ DWORD netconn_set_timeout( netconn_t *netconn, BOOL send, int value )
     tv.tv_sec = value / 1000;
     tv.tv_usec = (value % 1000) * 1000;
 
-    if ((res = setsockopt( netconn->socket, SOL_SOCKET, send ? SO_SNDTIMEO : SO_RCVTIMEO, &tv, sizeof(tv) ) == -1))
+    if ((res = setsockopt( netconn->socket, SOL_SOCKET, send ? SO_SNDTIMEO : SO_RCVTIMEO, (void*)&tv, sizeof(tv) ) == -1))
     {
         WARN("setsockopt failed (%s)\n", strerror( errno ));
         return sock_get_error( errno );
diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c
index 79e96a3..e688a51 100644
--- a/dlls/wininet/netconnection.c
+++ b/dlls/wininet/netconnection.c
@@ -769,7 +769,7 @@ DWORD NETCON_set_timeout(WININET_NETCONNECTION *connection, BOOL send, int value
     tv.tv_usec = (value % 1000) * 1000;
 
     result = setsockopt(connection->socketFD, SOL_SOCKET,
-                        send ? SO_SNDTIMEO : SO_RCVTIMEO, &tv,
+                        send ? SO_SNDTIMEO : SO_RCVTIMEO, (void*)&tv,
                         sizeof(tv));
 
     if (result == -1)