summaryrefslogtreecommitdiff
path: root/src/lisp.h
diff options
context:
space:
mode:
authorStefan Kangas <stefan@marxist.se>2021-12-03 06:30:26 +0100
committerStefan Kangas <stefan@marxist.se>2021-12-03 06:30:26 +0100
commitc66eb524537f98667507024e5f21e0b24038c964 (patch)
treea1eb41cf4585796fb43a0b2c51b177cbb1bf9b37 /src/lisp.h
parent67191f7eee3f2a4e83897c3d820f8c13c629dedb (diff)
parent9c222b9c1a7f91497a37567b4d7de3a511fff069 (diff)
downloademacs-c66eb524537f98667507024e5f21e0b24038c964.tar.gz
emacs-c66eb524537f98667507024e5f21e0b24038c964.tar.bz2
emacs-c66eb524537f98667507024e5f21e0b24038c964.zip
Merge from origin/emacs-28
9c222b9c1a Port to C compilers that lack size-0 arrays fed35a8951 Port emacsclient to Solaris 10 f35d6a9c73 * CONTRIBUTE: Improve commit message instructions e0ee1d003a Work around IBM XL C compiler bug 6b99b6eb8b * admin/make-tarball.txt: Various clarifications. bbf4140091 * admin/diff-tar-files: Don't assume .tar.gz. 0a50ad11db * lisp/tab-bar.el (tab-bar-close-other-tabs): Fix regression.
Diffstat (limited to 'src/lisp.h')
-rw-r--r--src/lisp.h16
1 files changed, 9 insertions, 7 deletions
diff --git a/src/lisp.h b/src/lisp.h
index 19caba40014..242156bbcb8 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -2091,10 +2091,12 @@ struct Lisp_Subr
Lisp_Object native_intspec;
};
EMACS_INT doc;
- Lisp_Object native_comp_u[NATIVE_COMP_FLAG];
- char *native_c_name[NATIVE_COMP_FLAG];
- Lisp_Object lambda_list[NATIVE_COMP_FLAG];
- Lisp_Object type[NATIVE_COMP_FLAG];
+#ifdef HAVE_NATIVE_COMP
+ Lisp_Object native_comp_u;
+ char *native_c_name;
+ Lisp_Object lambda_list;
+ Lisp_Object type;
+#endif
} GCALIGNED_STRUCT;
union Aligned_Lisp_Subr
{
@@ -4786,19 +4788,19 @@ extern char *emacs_root_dir (void);
INLINE bool
SUBR_NATIVE_COMPILEDP (Lisp_Object a)
{
- return SUBRP (a) && !NILP (XSUBR (a)->native_comp_u[0]);
+ return SUBRP (a) && !NILP (XSUBR (a)->native_comp_u);
}
INLINE bool
SUBR_NATIVE_COMPILED_DYNP (Lisp_Object a)
{
- return SUBR_NATIVE_COMPILEDP (a) && !NILP (XSUBR (a)->lambda_list[0]);
+ return SUBR_NATIVE_COMPILEDP (a) && !NILP (XSUBR (a)->lambda_list);
}
INLINE Lisp_Object
SUBR_TYPE (Lisp_Object a)
{
- return XSUBR (a)->type[0];
+ return XSUBR (a)->type;
}
INLINE struct Lisp_Native_Comp_Unit *