diff options
| author | Stefan Kangas <stefan@marxist.se> | 2021-12-03 06:30:26 +0100 |
|---|---|---|
| committer | Stefan Kangas <stefan@marxist.se> | 2021-12-03 06:30:26 +0100 |
| commit | c66eb524537f98667507024e5f21e0b24038c964 (patch) | |
| tree | a1eb41cf4585796fb43a0b2c51b177cbb1bf9b37 /src/lread.c | |
| parent | 67191f7eee3f2a4e83897c3d820f8c13c629dedb (diff) | |
| parent | 9c222b9c1a7f91497a37567b4d7de3a511fff069 (diff) | |
| download | emacs-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/lread.c')
| -rw-r--r-- | src/lread.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/lread.c b/src/lread.c index 2e63ec48912..5a2f1bc54e5 100644 --- a/src/lread.c +++ b/src/lread.c @@ -1279,7 +1279,10 @@ Return t if the file exists and loads successfully. */) || suffix_p (file, MODULES_SECONDARY_SUFFIX) #endif #endif - || (NATIVE_COMP_FLAG && suffix_p (file, NATIVE_ELISP_SUFFIX))) +#ifdef HAVE_NATIVE_COMP + || suffix_p (file, NATIVE_ELISP_SUFFIX) +#endif + ) must_suffix = Qnil; /* Don't insist on adding a suffix if the argument includes a directory name. */ @@ -1359,8 +1362,11 @@ Return t if the file exists and loads successfully. */) bool is_module = false; #endif - bool is_native_elisp = - NATIVE_COMP_FLAG && suffix_p (found, NATIVE_ELISP_SUFFIX) ? true : false; +#ifdef HAVE_NATIVE_COMP + bool is_native_elisp = suffix_p (found, NATIVE_ELISP_SUFFIX); +#else + bool is_native_elisp = false; +#endif /* Check if we're stuck in a recursive load cycle. |