Merge branch 'concurrency'

Conflicts (resolved):
	configure.ac
	src/Makefile.in
	src/alloc.c
	src/bytecode.c
	src/emacs.c
	src/eval.c
	src/lisp.h
	src/process.c
	src/regex.c
	src/regex.h

1 files changed, 1 insertions, 1 deletions

diff --git a/src/w32proc.c b/src/w32proc.c
index 189034c4e2d..2d2d948bfea 100644
--- a/src/w32proc.c
+++ b/src/w32proc.c
@@ -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, void *ignored)
+            struct timespec *timeout, sigset_t *ignored)
 {
   SELECT_TYPE orfds, owfds;
   DWORD timeout_ms, start_time;