Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 806-813)

   - Merge from emacs--rel--22
   - Update from CVS

 * emacs--rel--22  (patch 51-58)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 233-236)

   - Merge from emacs--devo--0
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-230

4 files changed, 17 insertions, 3 deletions

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 65f3bc7b622..df2344dc3af 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,14 @@
+2007-07-14  Jason Rumney  <jasonr@gnu.org>
+
+        * inc/sys/socket.h: Include winsock2.h and ws2tcpip.h instead
+        of winsock.h.
+
+2007-07-11  Jason Rumney  <jasonr@gnu.org>
+
+        * gmake.defs (OLE32): New library to link.
+
+        * nmake.defs (OLE32): Likewise.
+
 2007-06-25  Jason Rumney  <jasonr@gnu.org>
 
         * cmdproxy.c (main): Set console codepages to "ANSI".
diff --git a/nt/gmake.defs b/nt/gmake.defs
index 15ec2bf0ea3..c08ca32200f 100644
--- a/nt/gmake.defs
+++ b/nt/gmake.defs
@@ -176,8 +176,9 @@ MPR		= -lmpr
 SHELL32         = -lshell32
 USER32          = -luser32
 WSOCK32         = -lwsock32
-WINMM     = -lwinmm
+WINMM           = -lwinmm
 WINSPOOL        = -lwinspool
+OLE32           = -lole32
 
 ifdef NOOPT
 DEBUG_CFLAGS    = -DEMACSDEBUG
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
diff --git a/nt/nmake.defs b/nt/nmake.defs
index 5f52bc18c62..03ae2f851fa 100644
--- a/nt/nmake.defs
+++ b/nt/nmake.defs
@@ -123,8 +123,9 @@ MPR		= mpr.lib
 SHELL32         = shell32.lib

 USER32          = user32.lib

 WSOCK32         = wsock32.lib

-WINMM     = winmm.lib

+WINMM           = winmm.lib

 WINSPOOL        = winspool.lib

+OLE32           = ole32.lib

 

 !ifdef NOOPT

 DEBUG_CFLAGS    = -DEMACSDEBUG