Re: [RFA] Use winsock2 for mingw gdbserver

[Pedro Alves <pedro at codesourcery dot com>]

On Saturday 17 April 2010 06:39:45, Pierre Muller wrote:

> 
>  Here you are:
> is this OK?
>   Once again, it?s the formatting of the
> ChangeLog that seems the most uncertain to me...

It's fine, although "Include winsock2.h instead of winsock.h" would be
more straight to the point... (doesn't need to answer the question:
"and what is the winsock2 header in the first place? ws2.h?  other?")

When in doubt, start by looking at previous entries.  There are several
`* file.c (foo): Include bar.h.', but none `* file.c (foo): Include bar header.'

> 2010-04-17  Pierre Muller  <muller@ics.u-strasbg.fr>
> 
> 	* configure.ac: Use `ws2_32' library for srv_mingw.
> 	* configure: Regenerate.
> 	* gdbreplay.c: Use winsock2 header instead of winsock for mingw.
> 	* remote-utils.c: Likewise.

This is okay.

> 
> Index: configure
> ===================================================================
> RCS file: /cvs/src/src/gdb/gdbserver/configure,v
> retrieving revision 1.47
> diff -u -p -r1.47 configure
> --- configure	16 Apr 2010 16:22:15 -0000	1.47
> +++ configure	17 Apr 2010 05:25:59 -0000
> @@ -4056,7 +4056,7 @@ esac
>  if test "${srv_mingwce}" = "yes"; then
>    LIBS="$LIBS -lws2"
>  elif test "${srv_mingw}" = "yes"; then
> -  LIBS="$LIBS -lwsock32"
> +  LIBS="$LIBS -lws2_32"
>  elif test "${srv_qnx}" = "yes"; then
>    LIBS="$LIBS -lsocket"
>  fi
> Index: configure.ac
> ===================================================================
> RCS file: /cvs/src/src/gdb/gdbserver/configure.ac,v
> retrieving revision 1.33
> diff -u -p -r1.33 configure.ac
> --- configure.ac	23 Feb 2010 19:16:16 -0000	1.33
> +++ configure.ac	17 Apr 2010 05:25:59 -0000
> @@ -118,7 +118,7 @@ esac
>  if test "${srv_mingwce}" = "yes"; then
>    LIBS="$LIBS -lws2"
>  elif test "${srv_mingw}" = "yes"; then
> -  LIBS="$LIBS -lwsock32"
> +  LIBS="$LIBS -lws2_32"
>  elif test "${srv_qnx}" = "yes"; then
>    LIBS="$LIBS -lsocket"
>  fi
> Index: gdbreplay.c
> ===================================================================
> RCS file: /cvs/src/src/gdb/gdbserver/gdbreplay.c,v
> retrieving revision 1.24
> diff -u -p -r1.24 gdbreplay.c
> --- gdbreplay.c	1 Jan 2010 07:31:49 -0000	1.24
> +++ gdbreplay.c	17 Apr 2010 05:25:59 -0000
> @@ -59,7 +59,7 @@
>  #endif
>  
>  #if USE_WIN32API
> -#include <winsock.h>
> +#include <winsock2.h>
>  #endif
>  
>  #ifndef HAVE_SOCKLEN_T
> Index: remote-utils.c
> ===================================================================
> RCS file: /cvs/src/src/gdb/gdbserver/remote-utils.c,v
> retrieving revision 1.72
> diff -u -p -r1.72 remote-utils.c
> --- remote-utils.c	11 Apr 2010 16:33:56 -0000	1.72
> +++ remote-utils.c	17 Apr 2010 05:25:59 -0000
> @@ -63,7 +63,7 @@
>  #endif
>  
>  #if USE_WIN32API
> -#include <winsock.h>
> +#include <winsock2.h>
>  #endif
>  
>  #if __QNX__
> 
> 


-- 
Pedro Alves