diff options
| author | Eli Zaretskii | 2016-12-07 19:08:24 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2016-12-07 19:08:24 +0200 |
| commit | 16ac7c0fc91b5eb09f2a129fc2c01281369f897a (patch) | |
| tree | eda19beb88a398d83bb1c26bad45bad89204b17e /src/w32proc.c | |
| parent | 8ad92413b9349613f9815bd0aaf523896a84b479 (diff) | |
| download | emacs-16ac7c0fc91b5eb09f2a129fc2c01281369f897a.tar.gz emacs-16ac7c0fc91b5eb09f2a129fc2c01281369f897a.zip | |
Minimize spurious diffs from master.
Diffstat (limited to 'src/w32proc.c')
| -rw-r--r-- | src/w32proc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/w32proc.c b/src/w32proc.c index c4f1f693741..c9bc28510f7 100644 --- a/src/w32proc.c +++ b/src/w32proc.c | |||
| @@ -72,7 +72,7 @@ extern BOOL g_b_init_compare_string_w; | |||
| 72 | extern BOOL g_b_init_debug_break_process; | 72 | extern BOOL g_b_init_debug_break_process; |
| 73 | 73 | ||
| 74 | int sys_select (int, SELECT_TYPE *, SELECT_TYPE *, SELECT_TYPE *, | 74 | int sys_select (int, SELECT_TYPE *, SELECT_TYPE *, SELECT_TYPE *, |
| 75 | struct timespec *, sigset_t *); | 75 | struct timespec *, void *); |
| 76 | 76 | ||
| 77 | /* Signal handlers...SIG_DFL == 0 so this is initialized correctly. */ | 77 | /* Signal handlers...SIG_DFL == 0 so this is initialized correctly. */ |
| 78 | static signal_handler sig_handlers[NSIG]; | 78 | static signal_handler sig_handlers[NSIG]; |
| @@ -849,8 +849,8 @@ alarm (int seconds) | |||
| 849 | stream is terminated, terminates the reader thread as part of | 849 | stream is terminated, terminates the reader thread as part of |
| 850 | deleting the child_process object. | 850 | deleting the child_process object. |
| 851 | 851 | ||
| 852 | The sys_select function emulates the Posix 'pselect' function; it | 852 | The sys_select function emulates the Posix 'pselect' functionality; |
| 853 | is needed because the Windows 'select' function supports only | 853 | it is needed because the Windows 'select' function supports only |
| 854 | network sockets, while Emacs expects 'pselect' to work for any file | 854 | network sockets, while Emacs expects 'pselect' to work for any file |
| 855 | descriptor, including pipes and serial streams. | 855 | descriptor, including pipes and serial streams. |
| 856 | 856 | ||
| @@ -2096,7 +2096,7 @@ extern int proc_buffered_char[]; | |||
| 2096 | 2096 | ||
| 2097 | int | 2097 | int |
| 2098 | sys_select (int nfds, SELECT_TYPE *rfds, SELECT_TYPE *wfds, SELECT_TYPE *efds, | 2098 | sys_select (int nfds, SELECT_TYPE *rfds, SELECT_TYPE *wfds, SELECT_TYPE *efds, |
| 2099 | struct timespec *timeout, sigset_t *ignored) | 2099 | struct timespec *timeout, void *ignored) |
| 2100 | { | 2100 | { |
| 2101 | SELECT_TYPE orfds, owfds; | 2101 | SELECT_TYPE orfds, owfds; |
| 2102 | DWORD timeout_ms, start_time; | 2102 | DWORD timeout_ms, start_time; |