aboutsummaryrefslogtreecommitdiffstats
path: root/src/lisp.h
diff options
context:
space:
mode:
authorPaul Eggert2014-04-16 12:43:46 -0700
committerPaul Eggert2014-04-16 12:43:46 -0700
commit290d7ac277986bd118e594a8100b3f40e4492cb1 (patch)
treed63a3aa61cac577dd119665edaffe2def8d194e2 /src/lisp.h
parent37eccff4f72c5a36dcd4b89d417b0047aab84e50 (diff)
parentb262bde327db2cd9b2f01f2d3ed946d0b188cb9d (diff)
downloademacs-290d7ac277986bd118e594a8100b3f40e4492cb1.tar.gz
emacs-290d7ac277986bd118e594a8100b3f40e4492cb1.zip
Merge from emacs-24; up to 2014-04-16T15:28:26Z!monnier@iro.umontreal.ca
Diffstat (limited to 'src/lisp.h')
-rw-r--r--src/lisp.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lisp.h b/src/lisp.h
index 3e4ab174546..6ef0f83aea4 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -2527,11 +2527,13 @@ CHECK_WINDOW (Lisp_Object x)
2527{ 2527{
2528 CHECK_TYPE (WINDOWP (x), Qwindowp, x); 2528 CHECK_TYPE (WINDOWP (x), Qwindowp, x);
2529} 2529}
2530#ifdef subprocesses
2530INLINE void 2531INLINE void
2531CHECK_PROCESS (Lisp_Object x) 2532CHECK_PROCESS (Lisp_Object x)
2532{ 2533{
2533 CHECK_TYPE (PROCESSP (x), Qprocessp, x); 2534 CHECK_TYPE (PROCESSP (x), Qprocessp, x);
2534} 2535}
2536#endif
2535INLINE void 2537INLINE void
2536CHECK_NATNUM (Lisp_Object x) 2538CHECK_NATNUM (Lisp_Object x)
2537{ 2539{
@@ -4136,7 +4138,6 @@ extern bool running_asynch_code;
4136 4138
4137/* Defined in process.c. */ 4139/* Defined in process.c. */
4138extern Lisp_Object QCtype, Qlocal; 4140extern Lisp_Object QCtype, Qlocal;
4139extern Lisp_Object Qprocessp;
4140extern void kill_buffer_processes (Lisp_Object); 4141extern void kill_buffer_processes (Lisp_Object);
4141extern bool wait_reading_process_output (intmax_t, int, int, bool, 4142extern bool wait_reading_process_output (intmax_t, int, int, bool,
4142 Lisp_Object, 4143 Lisp_Object,