Merge from emacs--rel--22

[bpt/emacs.git] / nt / inc / sys / socket.h

diff --git a/nt/inc/sys/socket.h b/nt/inc/sys/socket.h
index c0a3bc2..741926f 100644 (file)
--- a/nt/inc/sys/socket.h
+++ b/nt/inc/sys/socket.h
@@ -1,11 +1,11 @@
-/* Copyright (C) 1995, 2002, 2003, 2004, 2005,
-      2006 Free Software Foundation, Inc.
+/* Copyright (C) 1995, 2001, 2002, 2003, 2004, 2005,
+      2006, 2007, 2008  Free Software Foundation, Inc.

 
 This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 
 This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)

 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,


@@ -51,7 +51,13 @@ Boston, MA 02110-1301, USA.  */
 #define timeval ws_timeval
 #endif
 
 #define timeval ws_timeval
 #endif
 

-#include <winsock.h>
+#include <winsock2.h>
+#include <ws2tcpip.h>
+/* process.c uses uint16_t (from C99) for IPv6, but
+   apparently it is not defined in some versions of mingw and msvc.  */
+#ifndef UINT16_C
+typedef unsigned short uint16_t;
+#endif

 
 /* redefine select to reference our version */
 #ifdef MUST_REDEF_SELECT
 
 /* redefine select to reference our version */
 #ifdef MUST_REDEF_SELECT