Tiny lisp.h cleanup

* lisp.h (XTERMINAL): Add eassert.
* process.c (make_lisp_proc): Now static here.

diff --git a/src/ChangeLog b/src/ChangeLog
index 63da5cbd9721bd38c6df7a960c62f430391ab554..0601e5a5aeda6c13c10d62da3e105e7f7c60bed0 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -15,6 +15,9 @@
        * window.c (allocate_window): Now static here.
        Use ALLOCATE_ZEROED_PSEUDOVECTOR.  Add comment.
 
+       * lisp.h (XTERMINAL): Add eassert.
+       * process.c (make_lisp_proc): Now static here.
+
 2015-01-16  Paul Eggert  <eggert@cs.ucla.edu>
 
        Give up on -Wsuggest-attribute=const

diff --git a/src/lisp.h b/src/lisp.h
index fd0a0342cf8e025ab3bb15d780949ec71a295587..7c7d3f3e2e57fb93b1144db78f013d2a7f39a9df 100644 (file)
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -608,6 +608,7 @@ INLINE bool SUBRP (Lisp_Object);
 INLINE bool (SYMBOLP) (Lisp_Object);
 INLINE bool (VECTORLIKEP) (Lisp_Object);
 INLINE bool WINDOWP (Lisp_Object);
+INLINE bool TERMINALP (Lisp_Object);
 INLINE struct Lisp_Save_Value *XSAVE_VALUE (Lisp_Object);
 INLINE struct Lisp_Symbol *(XSYMBOL) (Lisp_Object);
 INLINE void *(XUNTAG) (Lisp_Object, int);
@@ -998,6 +999,7 @@ XWINDOW (Lisp_Object a)
 INLINE struct terminal *
 XTERMINAL (Lisp_Object a)
 {
+  eassert (TERMINALP (a));
   return XUNTAG (a, Lisp_Vectorlike);
 }
 
@@ -1060,12 +1062,6 @@ builtin_lisp_symbol (int index)
   return make_lisp_symbol (lispsym + index);
 }
 
-INLINE Lisp_Object
-make_lisp_proc (struct Lisp_Process *p)
-{
-  return make_lisp_ptr (p, Lisp_Vectorlike);
-}
-
 #define XSETINT(a, b) ((a) = make_number (b))
 #define XSETFASTINT(a, b) ((a) = make_natnum (b))
 #define XSETCONS(a, b) ((a) = make_lisp_ptr (b, Lisp_Cons))

diff --git a/src/process.c b/src/process.c
index 3038054821067e41bc73ae3e4c7f93e2ab81aa2d..0789f20f1d2ad971ddd890656ed8a979276cd66e 100644 (file)
--- a/src/process.c
+++ b/src/process.c
@@ -422,6 +422,11 @@ pset_write_queue (struct Lisp_Process *p, Lisp_Object val)
 }
 
 \f
+static Lisp_Object
+make_lisp_proc (struct Lisp_Process *p)
+{
+  return make_lisp_ptr (p, Lisp_Vectorlike);
+}
 
 static struct fd_callback_data
 {