1 files changed, 15 insertions, 6 deletions

diff --git a/src/lisp.h b/src/lisp.h
index 3324dac98f6..a22043026ad 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -2127,10 +2127,7 @@ CHAR_TABLE_SET (Lisp_Object ct, int idx, Lisp_Object val)
    It is generated by the DEFUN macro only.
    defsubr makes it into a Lisp object.  */
 
-struct Lisp_Subr
-  {
-    union vectorlike_header header;
-    union {
+union Lisp_Function {
       Lisp_Object (*a0) (void);
       Lisp_Object (*a1) (Lisp_Object);
       Lisp_Object (*a2) (Lisp_Object, Lisp_Object);
@@ -2142,10 +2139,18 @@ struct Lisp_Subr
       Lisp_Object (*a8) (Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object);
       Lisp_Object (*aUNEVALLED) (Lisp_Object args);
       Lisp_Object (*aMANY) (ptrdiff_t, Lisp_Object *);
-    } function;
+};
+
+struct Lisp_Subr
+  {
+    union vectorlike_header header;
+    union Lisp_Function function;
+    union Lisp_Function normal_function;
+    union Lisp_Function BC_function;
     short min_args, max_args;
     const char *symbol_name;
     const char *intspec;
+    union Aligned_Lisp_Subr *next;
     EMACS_INT doc;
   } GCALIGNED_STRUCT;
 union Aligned_Lisp_Subr
@@ -3162,7 +3167,11 @@ CHECK_INTEGER (Lisp_Object x)
   static union Aligned_Lisp_Subr sname =                                \
      {{{ PVEC_SUBR << PSEUDOVECTOR_AREA_BITS },                         \
        { .a ## maxargs = fnname },                                      \
-       minargs, maxargs, lname, intspec, 0}};                           \
+       { .a ## maxargs = fnname },                                      \
+       { .a ## maxargs = /* BC_ ##  */fnname },                               \
+       minargs, maxargs, lname, intspec,                                \
+       NULL,                                                            \
+       0}};                                                             \
    Lisp_Object fnname
 
 /* defsubr (Sname);