From: Tom Tromey <tromey@redhat.com>
Date: Fri, 8 Mar 2013 18:57:29 +0000 (-0700)
Subject: merge from trunk
X-Git-Tag: emacs-26.0.90~1144^2~17^2~46
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=71f91792e3013b397996905224f387da5cc539a9;p=emacs.git

merge from trunk
---

71f91792e3013b397996905224f387da5cc539a9
diff --cc configure.ac
index 4c1c5a8e738,aed625e44a9..1caf1edc214
--- a/configure.ac
+++ b/configure.ac
@@@ -1292,8 -1199,8 +1199,8 @@@ dnl checks for header file
  AC_CHECK_HEADERS_ONCE(
    linux/version.h sys/systeminfo.h
    coff.h pty.h
-   sys/vlimit.h sys/resource.h
+   sys/resource.h
 -  sys/utsname.h pwd.h utmp.h util.h)
 +  sys/utsname.h pwd.h utmp.h util.h sys/prctl.h)
  
  AC_MSG_CHECKING(if personality LINUX32 can be set)
  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/personality.h>]], [[personality (PER_LINUX32)]])],
diff --cc src/process.c
index d56819da67a,bafdca9bd63..044e0c54772
--- a/src/process.c
+++ b/src/process.c
@@@ -4376,13 -4211,9 +4374,13 @@@ wait_reading_process_output (intmax_t t
    Lisp_Object proc;
    EMACS_TIME timeout, end_time;
    int wait_channel = -1;
-   int got_some_input = 0;
+   bool got_some_input = 0;
    ptrdiff_t count = SPECPDL_INDEX ();
  
 +  eassert (wait_proc == NULL
 +	   || EQ (wait_proc->thread, Qnil)
 +	   || XTHREAD (wait_proc->thread) == current_thread);
 +
    FD_ZERO (&Available);
    FD_ZERO (&Writeok);