From 12ea4b698643d57c73ac153d8b87adf2db0e8bd8 Mon Sep 17 00:00:00 2001
From: Pierre Muller <muller@sourceware.org>
Date: Sat, 17 Apr 2010 20:43:13 +0000
Subject: [PATCH] 	* configure.ac: Use `ws2_32' library for srv_mingw. 
 * configure: Regenerate. 	* gdbreplay.c: Include winsock2.h instead of
 winsock.h. 	* remote-utils.c: Likewise.

---
 gdb/gdbserver/ChangeLog      | 7 +++++++
 gdb/gdbserver/configure      | 2 +-
 gdb/gdbserver/configure.ac   | 2 +-
 gdb/gdbserver/gdbreplay.c    | 2 +-
 gdb/gdbserver/remote-utils.c | 2 +-
 5 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index 49e6bb661ac..842f2fac27f 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,10 @@
+2010-04-17  Pierre Muller  <muller@ics.u-strasbg.fr>
+
+	* configure.ac: Use `ws2_32' library for srv_mingw.
+	* configure: Regenerate.
+	* gdbreplay.c: Include winsock2.h instead of winsock.h.
+	* remote-utils.c: Likewise.
+
 2010-04-17  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* linux-x86-low.c (xmltarget_amd64_linux_no_xml): Define only
diff --git a/gdb/gdbserver/configure b/gdb/gdbserver/configure
index dba6a912632..8db886155a8 100755
--- a/gdb/gdbserver/configure
+++ b/gdb/gdbserver/configure
@@ -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
diff --git a/gdb/gdbserver/configure.ac b/gdb/gdbserver/configure.ac
index f86291889c1..a2dfa372546 100644
--- a/gdb/gdbserver/configure.ac
+++ b/gdb/gdbserver/configure.ac
@@ -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
diff --git a/gdb/gdbserver/gdbreplay.c b/gdb/gdbserver/gdbreplay.c
index 6ce00b3e224..a128413c478 100644
--- a/gdb/gdbserver/gdbreplay.c
+++ b/gdb/gdbserver/gdbreplay.c
@@ -59,7 +59,7 @@
 #endif
 
 #if USE_WIN32API
-#include <winsock.h>
+#include <winsock2.h>
 #endif
 
 #ifndef HAVE_SOCKLEN_T
diff --git a/gdb/gdbserver/remote-utils.c b/gdb/gdbserver/remote-utils.c
index 6a93c3ae20c..ae04d135887 100644
--- a/gdb/gdbserver/remote-utils.c
+++ b/gdb/gdbserver/remote-utils.c
@@ -63,7 +63,7 @@
 #endif
 
 #if USE_WIN32API
-#include <winsock.h>
+#include <winsock2.h>
 #endif
 
 #if __QNX__
-- 
2.30.2