diff options
| author | Miles Bader <miles@gnu.org> | 2007-07-24 01:25:28 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-07-24 01:25:28 +0000 |
| commit | 492d9f3e3ccd2b640958e840caa451e9e04e86db (patch) | |
| tree | c87779daf272535b621216ef05179fa48102e57e /nt/inc/sys/socket.h | |
| parent | 7eb1e4534e88a32fe5e549e630fdabf3e062be2b (diff) | |
| parent | 1e8995158740b15936887264a3d7183beb5c51d9 (diff) | |
| download | emacs-492d9f3e3ccd2b640958e840caa451e9e04e86db.tar.gz emacs-492d9f3e3ccd2b640958e840caa451e9e04e86db.tar.bz2 emacs-492d9f3e3ccd2b640958e840caa451e9e04e86db.zip | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 814-823)
- Update from CVS
- Merge from emacs--rel--22
* emacs--rel--22 (patch 59-69)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 237-238)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-26
Diffstat (limited to 'nt/inc/sys/socket.h')
| -rw-r--r-- | nt/inc/sys/socket.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/nt/inc/sys/socket.h b/nt/inc/sys/socket.h index 2e52c74691e..a9825ee197d 100644 --- a/nt/inc/sys/socket.h +++ b/nt/inc/sys/socket.h @@ -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 |