diff options
| author | Dmitry Antipov | 2015-01-16 14:41:20 +0300 |
|---|---|---|
| committer | Dmitry Antipov | 2015-01-16 14:41:20 +0300 |
| commit | 7ee2733f1ecd3d4f2bd782aa802b090c77fbb135 (patch) | |
| tree | 630d68f6cbd86350adeddd59ba87eb105ff2ad0b /src/lisp.h | |
| parent | b689b906f27c326c4c7531d4987ffaae49b50dcd (diff) | |
| download | emacs-7ee2733f1ecd3d4f2bd782aa802b090c77fbb135.tar.gz emacs-7ee2733f1ecd3d4f2bd782aa802b090c77fbb135.zip | |
Tiny lisp.h cleanup
* lisp.h (XTERMINAL): Add eassert.
* process.c (make_lisp_proc): Now static here.
Diffstat (limited to 'src/lisp.h')
| -rw-r--r-- | src/lisp.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/lisp.h b/src/lisp.h index fd0a0342cf8..7c7d3f3e2e5 100644 --- a/src/lisp.h +++ b/src/lisp.h | |||
| @@ -608,6 +608,7 @@ INLINE bool SUBRP (Lisp_Object); | |||
| 608 | INLINE bool (SYMBOLP) (Lisp_Object); | 608 | INLINE bool (SYMBOLP) (Lisp_Object); |
| 609 | INLINE bool (VECTORLIKEP) (Lisp_Object); | 609 | INLINE bool (VECTORLIKEP) (Lisp_Object); |
| 610 | INLINE bool WINDOWP (Lisp_Object); | 610 | INLINE bool WINDOWP (Lisp_Object); |
| 611 | INLINE bool TERMINALP (Lisp_Object); | ||
| 611 | INLINE struct Lisp_Save_Value *XSAVE_VALUE (Lisp_Object); | 612 | INLINE struct Lisp_Save_Value *XSAVE_VALUE (Lisp_Object); |
| 612 | INLINE struct Lisp_Symbol *(XSYMBOL) (Lisp_Object); | 613 | INLINE struct Lisp_Symbol *(XSYMBOL) (Lisp_Object); |
| 613 | INLINE void *(XUNTAG) (Lisp_Object, int); | 614 | INLINE void *(XUNTAG) (Lisp_Object, int); |
| @@ -998,6 +999,7 @@ XWINDOW (Lisp_Object a) | |||
| 998 | INLINE struct terminal * | 999 | INLINE struct terminal * |
| 999 | XTERMINAL (Lisp_Object a) | 1000 | XTERMINAL (Lisp_Object a) |
| 1000 | { | 1001 | { |
| 1002 | eassert (TERMINALP (a)); | ||
| 1001 | return XUNTAG (a, Lisp_Vectorlike); | 1003 | return XUNTAG (a, Lisp_Vectorlike); |
| 1002 | } | 1004 | } |
| 1003 | 1005 | ||
| @@ -1060,12 +1062,6 @@ builtin_lisp_symbol (int index) | |||
| 1060 | return make_lisp_symbol (lispsym + index); | 1062 | return make_lisp_symbol (lispsym + index); |
| 1061 | } | 1063 | } |
| 1062 | 1064 | ||
| 1063 | INLINE Lisp_Object | ||
| 1064 | make_lisp_proc (struct Lisp_Process *p) | ||
| 1065 | { | ||
| 1066 | return make_lisp_ptr (p, Lisp_Vectorlike); | ||
| 1067 | } | ||
| 1068 | |||
| 1069 | #define XSETINT(a, b) ((a) = make_number (b)) | 1065 | #define XSETINT(a, b) ((a) = make_number (b)) |
| 1070 | #define XSETFASTINT(a, b) ((a) = make_natnum (b)) | 1066 | #define XSETFASTINT(a, b) ((a) = make_natnum (b)) |
| 1071 | #define XSETCONS(a, b) ((a) = make_lisp_ptr (b, Lisp_Cons)) | 1067 | #define XSETCONS(a, b) ((a) = make_lisp_ptr (b, Lisp_Cons)) |