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 2e52c74..f848231 100644 (file)
--- a/nt/inc/sys/socket.h
+++ b/nt/inc/sys/socket.h
@@ -5,7 +5,7 @@ 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,
@@ -53,6 +53,11 @@ Boston, MA 02110-1301, USA.  */
 
 #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