mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-09 05:01:02 -08:00
Code Issues Projects Releases Wiki Activity

Minimize spurious diffs from master.

Browse source
This commit is contained in:
Eli Zaretskii 2016-12-07 19:08:24 +02:00
parent 8ad92413b9
commit 16ac7c0fc9
3 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/w32.c
View file

@ -272,7 +272,7 @@ static BOOL WINAPI revert_to_self (void);
static int sys_access (const char *, int);
extern void *e_malloc (size_t);
extern int sys_select (int, SELECT_TYPE *, SELECT_TYPE *, SELECT_TYPE *,
struct timespec *, sigset_t *);
struct timespec *, void *);
extern int sys_dup (int);

1
src/w32.h
View file

@ -25,6 +25,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#include <windows.h>
/* File descriptor set emulation. */
/* MSVC runtime library has limit of 64 descriptors by default */

8
src/w32proc.c
View file

@ -72,7 +72,7 @@ extern BOOL g_b_init_compare_string_w;
extern BOOL g_b_init_debug_break_process;
int sys_select (int, SELECT_TYPE *, SELECT_TYPE *, SELECT_TYPE *,
struct timespec *, sigset_t *);
struct timespec *, void *);
/* Signal handlers...SIG_DFL == 0 so this is initialized correctly. */
static signal_handler sig_handlers[NSIG];
@ -849,8 +849,8 @@ alarm (int seconds)
stream is terminated, terminates the reader thread as part of
deleting the child_process object.
The sys_select function emulates the Posix 'pselect' function; it
is needed because the Windows 'select' function supports only
The sys_select function emulates the Posix 'pselect' functionality;
it is needed because the Windows 'select' function supports only
network sockets, while Emacs expects 'pselect' to work for any file
descriptor, including pipes and serial streams.
@ -2096,7 +2096,7 @@ extern int proc_buffered_char[];
int
sys_select (int nfds, SELECT_TYPE *rfds, SELECT_TYPE *wfds, SELECT_TYPE *efds,
struct timespec *timeout, sigset_t *ignored)
struct timespec *timeout, void *ignored)
{
SELECT_TYPE orfds, owfds;
DWORD timeout_ms, start_time;