[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] test-concurrency 16ac7c0 6/8: Minimize spurious diffs from
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] test-concurrency 16ac7c0 6/8: Minimize spurious diffs from master. |
Date: |
Thu, 8 Dec 2016 17:13:48 +0000 (UTC) |
branch: test-concurrency
commit 16ac7c0fc91b5eb09f2a129fc2c01281369f897a
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>
Minimize spurious diffs from master.
---
src/w32.c | 2 +-
src/w32.h | 1 +
src/w32proc.c | 8 ++++----
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/w32.c b/src/w32.c
index 7a80275..086c1ac 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -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);
diff --git a/src/w32.h b/src/w32.h
index 760bb14..702bb52 100644
--- a/src/w32.h
+++ b/src/w32.h
@@ -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 */
diff --git a/src/w32proc.c b/src/w32proc.c
index c4f1f69..c9bc285 100644
--- a/src/w32proc.c
+++ b/src/w32proc.c
@@ -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;
- [Emacs-diffs] branch test-concurrency created (now 128cacd), Eli Zaretskii, 2016/12/08
- [Emacs-diffs] test-concurrency e4deba0 2/8: Fix merged code in process.c and eval.c., Eli Zaretskii, 2016/12/08
- [Emacs-diffs] test-concurrency 128cacd 8/8: Add a NEWS entry., Eli Zaretskii, 2016/12/08
- [Emacs-diffs] test-concurrency 66a5abb 3/8: Fix compilation problems., Eli Zaretskii, 2016/12/08
- [Emacs-diffs] test-concurrency 16ac7c0 6/8: Minimize spurious diffs from master.,
Eli Zaretskii <=
- [Emacs-diffs] test-concurrency fa7d1f0 7/8: Fix network streams., Eli Zaretskii, 2016/12/08
- [Emacs-diffs] test-concurrency 8ad9241 5/8: Fix the test suite, Eli Zaretskii, 2016/12/08
- [Emacs-diffs] test-concurrency 137898d 4/8: Fix a typo in bytecode.c., Eli Zaretskii, 2016/12/08
- [Emacs-diffs] test-concurrency de4624c 1/8: Merge branch 'concurrency', Eli Zaretskii, 2016/12/08