diff options
| author | Eli Zaretskii | 2013-08-26 21:42:11 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2013-08-26 21:42:11 +0300 |
| commit | 6e9fb70cdf763da6d264932f14f5a67d354ec38d (patch) | |
| tree | 8c9ecd47a5078c8b1c20662853a095523a7b1989 /src/w32proc.c | |
| parent | c160274456eb7bb09776b888f5274933f2ec2399 (diff) | |
| download | emacs-6e9fb70cdf763da6d264932f14f5a67d354ec38d.tar.gz emacs-6e9fb70cdf763da6d264932f14f5a67d354ec38d.zip | |
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.
Diffstat (limited to 'src/w32proc.c')
| -rw-r--r-- | src/w32proc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/w32proc.c b/src/w32proc.c index 84589388cd7..599cb3c3227 100644 --- a/src/w32proc.c +++ b/src/w32proc.c | |||
| @@ -1916,7 +1916,7 @@ extern int proc_buffered_char[]; | |||
| 1916 | 1916 | ||
| 1917 | int | 1917 | int |
| 1918 | sys_select (int nfds, SELECT_TYPE *rfds, SELECT_TYPE *wfds, SELECT_TYPE *efds, | 1918 | sys_select (int nfds, SELECT_TYPE *rfds, SELECT_TYPE *wfds, SELECT_TYPE *efds, |
| 1919 | EMACS_TIME *timeout, void *ignored) | 1919 | EMACS_TIME *timeout, sigset_t *ignored) |
| 1920 | { | 1920 | { |
| 1921 | SELECT_TYPE orfds; | 1921 | SELECT_TYPE orfds; |
| 1922 | DWORD timeout_ms, start_time; | 1922 | DWORD timeout_ms, start_time; |