From 6e9fb70cdf763da6d264932f14f5a67d354ec38d Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Mon, 26 Aug 2013 21:42:11 +0300 Subject: Fix MS-Windows build. src/callproc.c: src/emacs.c: src/filelock.c: src/process.c: src/sysdep.c: src/w32.c: Reshuffle Windows-specific headers to avoid errors with redefinition of fd_set etc. src/process.c: Don't use num_pending_connects when NON_BLOCKING_CONNECT is not defined. src/sysselect.h: Move definitions of FD_* macros and of SELECT_TYPE here from w32.h. src/w32proc.c (sys_select): Adjust the argument types to what thread.h expects. nt/inc/sys/socket.h: Include stdint.h. Include sysselect.h instead of w32.h. --- nt/ChangeLog | 5 +++++ nt/inc/sys/socket.h | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'nt') diff --git a/nt/ChangeLog b/nt/ChangeLog index ebc823071a3..cf0853c7045 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,3 +1,8 @@ +2013-08-26 Eli Zaretskii + + * inc/sys/socket.h: Include stdint.h. Include sysselect.h instead + of w32.h. + 2013-08-25 Vincent Belaïche * configure.bat: Rather than disabling, make configure.bat produce diff --git a/nt/inc/sys/socket.h b/nt/inc/sys/socket.h index 93bf9f91665..02a0584820f 100644 --- a/nt/inc/sys/socket.h +++ b/nt/inc/sys/socket.h @@ -53,6 +53,7 @@ along with GNU Emacs. If not, see . */ #include /* process.c uses uint16_t (from C99) for IPv6, but apparently it is not defined in some versions of mingw and msvc. */ +#include #ifndef UINT16_C typedef unsigned short uint16_t; #endif @@ -73,7 +74,7 @@ typedef unsigned short uint16_t; /* allow us to provide our own version of fd_set */ #define fd_set ws_fd_set -#include "w32.h" +#include "sysselect.h" #endif /* EMACS_CONFIG_H */ #if defined (HAVE_TIMEVAL) && defined (_MSC_VER) -- cgit v1.2.1