[PATCH 06/11] [C++/mingw] ser-tcp.c casts

[Pedro Alves <palves at redhat dot com>]

Fixes a few errors like these:

../../src/gdb/ser-tcp.c: In function 'int net_open(serial*, const char*)':
../../src/gdb/ser-tcp.c:286:73: error: invalid conversion from 'void*' to 'char*' [-fpermissive]
     res = getsockopt (scb->fd, SOL_SOCKET, SO_ERROR, (void *) &err, &len);
                                                                         ^

gdb/ChangeLog:
2015-11-01  Pedro Alves  <palves@redhat.com>

	* ser-tcp.c (net_open) [USE_WIN32API]: Cast getsockopt argument to
	char * instead of void *.
	(net_read_prim): Cast recv argument to
	char * instead of void *.
	(net_write_prim): Cast send argument to char * instead of void *.
---
 gdb/ser-tcp.c | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/gdb/ser-tcp.c b/gdb/ser-tcp.c
index ce40b61..507e0a1 100644
--- a/gdb/ser-tcp.c
+++ b/gdb/ser-tcp.c
@@ -280,10 +280,12 @@ net_open (struct serial *scb, const char *name)
 
     len = sizeof (err);
     /* On Windows, the fourth parameter to getsockopt is a "char *";
-       on UNIX systems it is generally "void *".  The cast to "void *"
-       is OK everywhere, since in C "void *" can be implicitly
-       converted to any pointer type.  */
+       on UNIX systems it is generally "void *".  */
+#ifdef USE_WIN32API
+    res = getsockopt (scb->fd, SOL_SOCKET, SO_ERROR, (char *) &err, &len);
+#else
     res = getsockopt (scb->fd, SOL_SOCKET, SO_ERROR, (void *) &err, &len);
+#endif
     if (res < 0 || err)
       {
 	/* Maybe the target still isn't ready to accept the connection.  */
@@ -339,16 +341,21 @@ net_close (struct serial *scb)
 int
 net_read_prim (struct serial *scb, size_t count)
 {
-  /* Need to cast to silence -Wpointer-sign on MinGW, as Winsock's
-     'recv' takes 'char *' as second argument, while 'scb->buf' is
-     'unsigned char *'.  */
+#ifdef USE_WIN32API
+  return recv (scb->fd, (char *) scb->buf, count, 0);
+#else
   return recv (scb->fd, (void *) scb->buf, count, 0);
+#endif
 }
 
 int
 net_write_prim (struct serial *scb, const void *buf, size_t count)
 {
+#ifdef USE_WIN32API
+  return send (scb->fd, (const char *) buf, count, 0);
+#else
   return send (scb->fd, buf, count, 0);
+#endif
 }
 
 int
-- 
1.9.3