From 5b5bc154732d1f532803aae8fa2045decd38bbea Mon Sep 17 00:00:00 2001 From: Lin Sun Date: Sat, 22 Oct 2022 00:00:06 +0000 Subject: [PATCH] lisp.h: suround the gflags.will_dump_ with same directives as its definition --- src/eval.c | 2 ++ src/fns.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/eval.c b/src/eval.c index 8810136..7e0c73b 100644 --- a/src/eval.c +++ b/src/eval.c @@ -2300,9 +2300,11 @@ DEFUN ("autoload-do-load", Fautoload_do_load, Sautoload_do_load, 1, 3, 0, of what files are preloaded and when. */ if (will_dump_p () && !will_bootstrap_p ()) { +#if defined HAVE_PDUMPER || defined HAVE_UNEXEC /* Avoid landing here recursively while outputting the backtrace from the error. */ gflags.will_dump_ = false; +#endif error ("Attempt to autoload %s while preparing to dump", SDATA (SYMBOL_NAME (funname))); } diff --git a/src/fns.c b/src/fns.c index 4055792..9be65de 100644 --- a/src/fns.c +++ b/src/fns.c @@ -3329,7 +3329,9 @@ DEFUN ("require", Frequire, Srequire, 1, 3, 0, { /* Avoid landing here recursively while outputting the backtrace from the error. */ +#if defined HAVE_PDUMPER || defined HAVE_UNEXEC gflags.will_dump_ = false; +#endif error ("(require %s) while preparing to dump", SDATA (SYMBOL_NAME (feature))); } -- 2.7.0