aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Rumney2007-07-14 23:03:37 +0000
committerJason Rumney2007-07-14 23:03:37 +0000
commita2dcccd99e11e8155b42111148909967e58d71c6 (patch)
treee444d28574410eedb8c0d15da19d07fb5c600767
parenta25beddb336ccc3f7d40dc7e9c73e042bf1da366 (diff)
downloademacs-a2dcccd99e11e8155b42111148909967e58d71c6.tar.gz
emacs-a2dcccd99e11e8155b42111148909967e58d71c6.zip
Include winsock2.h and ws2tcpip.h instead of winsock.h.
-rw-r--r--nt/ChangeLog5
-rw-r--r--nt/inc/sys/socket.h3
2 files changed, 7 insertions, 1 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog
index 65f3bc7b622..c23d65d48e5 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,8 @@
12007-07-14 Jason Rumney <jasonr@gnu.org>
2
3 * inc/sys/socket.h: Include winsock2.h and ws2tcpip.h instead
4 of winsock.h.
5
12007-06-25 Jason Rumney <jasonr@gnu.org> 62007-06-25 Jason Rumney <jasonr@gnu.org>
2 7
3 * cmdproxy.c (main): Set console codepages to "ANSI". 8 * 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. */
51#define timeval ws_timeval 51#define timeval ws_timeval
52#endif 52#endif
53 53
54#include <winsock.h> 54#include <winsock2.h>
55#include <ws2tcpip.h>
55 56
56/* redefine select to reference our version */ 57/* redefine select to reference our version */
57#ifdef MUST_REDEF_SELECT 58#ifdef MUST_REDEF_SELECT