From: Jason Rumney <jasonr@gnu.org>
Date: Sat, 14 Jul 2007 23:03:37 +0000 (+0000)
Subject: Include winsock2.h and ws2tcpip.h instead of winsock.h.
X-Git-Tag: emacs-pretest-23.0.90~11909
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a2dcccd99e11e8155b42111148909967e58d71c6;p=emacs.git

Include winsock2.h and ws2tcpip.h instead of winsock.h.
---

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 65f3bc7b622..c23d65d48e5 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-14  Jason Rumney  <jasonr@gnu.org>
+
+	* inc/sys/socket.h: Include winsock2.h and ws2tcpip.h instead
+	of winsock.h.
+
 2007-06-25  Jason Rumney  <jasonr@gnu.org>
 
 	* cmdproxy.c (main): Set console codepages to "ANSI".
diff --git a/nt/inc/sys/socket.h b/nt/inc/sys/socket.h
index 0923dd9246b..2e52c74691e 100644
--- a/nt/inc/sys/socket.h
+++ b/nt/inc/sys/socket.h
@@ -51,7 +51,8 @@ Boston, MA 02110-1301, USA.  */
 #define timeval ws_timeval
 #endif
 
-#include <winsock.h>
+#include <winsock2.h>
+#include <ws2tcpip.h>
 
 /* redefine select to reference our version */
 #ifdef MUST_REDEF_SELECT