aboutsummaryrefslogtreecommitdiffstats
path: root/src/lisp.h
diff options
context:
space:
mode:
authorNickolas Lloyd2017-02-01 21:07:03 -0500
committerNickolas Lloyd2017-02-01 21:10:32 -0500
commit5d8f2548ceaa5a0b33c08a39f1d6c11071ec63aa (patch)
treecb634d796ce62dbba8c3e9295749d8e6f9e9c345 /src/lisp.h
parent3dcb25deaefb52c9d314c4eddb93a3a815a58ec0 (diff)
downloademacs-5d8f2548ceaa5a0b33c08a39f1d6c11071ec63aa.tar.gz
emacs-5d8f2548ceaa5a0b33c08a39f1d6c11071ec63aa.zip
; Fix errors introduced during merge.
Diffstat (limited to 'src/lisp.h')
-rw-r--r--src/lisp.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/lisp.h b/src/lisp.h
index 0c444cc766f..a29335904fd 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -2777,11 +2777,6 @@ CHECK_COMPILED (Lisp_Object x)
2777{ 2777{
2778 CHECK_TYPE (COMPILEDP (x), Qcompiledp, x); 2778 CHECK_TYPE (COMPILEDP (x), Qcompiledp, x);
2779} 2779}
2780INLINE void
2781CHECK_BOOL_VECTOR (Lisp_Object x)
2782{
2783 CHECK_TYPE (BOOL_VECTOR_P (x), Qbool_vector_p, x);
2784}
2785/* This is a bit special because we always need size afterwards. */ 2780/* This is a bit special because we always need size afterwards. */
2786INLINE ptrdiff_t 2781INLINE ptrdiff_t
2787CHECK_VECTOR_OR_STRING (Lisp_Object x) 2782CHECK_VECTOR_OR_STRING (Lisp_Object x)
@@ -4173,7 +4168,6 @@ extern int read_bytecode_char (bool);
4173 4168
4174/* Defined in bytecode.c. */ 4169/* Defined in bytecode.c. */
4175extern void syms_of_bytecode (void); 4170extern void syms_of_bytecode (void);
4176extern void relocate_byte_stack (struct byte_stack *);
4177extern Lisp_Object exec_byte_code (Lisp_Object, Lisp_Object, ptrdiff_t, Lisp_Object *); 4171extern Lisp_Object exec_byte_code (Lisp_Object, Lisp_Object, ptrdiff_t, Lisp_Object *);
4178extern Lisp_Object get_byte_code_arity (Lisp_Object); 4172extern Lisp_Object get_byte_code_arity (Lisp_Object);
4179 4173