From 447296fe546ca323b03f10f478acb9e71f9cfc95 Mon Sep 17 00:00:00 2001 From: Po Lu Date: Mon, 10 Mar 2025 09:43:13 +0800 Subject: [PATCH] ; Correct typos in commentary and error messages * src/lisp.h (USE_LSB_TAG): * src/pdumper.c (pdumper_load): Correct typos in commentary and error messages. (cherry picked from commit 5176eeb3003a4d31053b07a9c6045da723fa257d) --- src/lisp.h | 4 ++-- src/pdumper.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lisp.h b/src/lisp.h index 4506f8613a8..350533547a7 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -257,9 +257,9 @@ DEFINE_GDB_SYMBOL_BEGIN (bool, USE_LSB_TAG) && !defined __alignas_is_defined \ && __STDC_VERSION__ < 202311 && __cplusplus < 201103) #define USE_LSB_TAG 0 -#else /* EMACS_INT_WIDTH >= GCALIGNMENT || defined alignas ... */ +#else /* ALIGNOF_EMACS_INT >= IDEAL_GCALIGNMENT || defined alignas ... */ #define USE_LSB_TAG (VAL_MAX / 2 < INTPTR_MAX) -#endif /* EMACS_INT_WIDTH >= GCALIGNMENT || defined alignas ... */ +#endif /* ALIGNOF_EMACS_INT >= IDEAL_GCALIGNMENT || defined alignas ... */ DEFINE_GDB_SYMBOL_END (USE_LSB_TAG) /* Mask for the value (as opposed to the type bits) of a Lisp object. */ diff --git a/src/pdumper.c b/src/pdumper.c index 8e10e561bcf..166ba32eab7 100644 --- a/src/pdumper.c +++ b/src/pdumper.c @@ -5810,7 +5810,7 @@ pdumper_load (const char *dump_filename, char *argv0) if ((dump_base + dump_size) & ~VALMASK) { fprintf (stderr, - "Failed to load dump file: 0x%p+0x%p & 0x%p != 0\n", + "Failed to load dump file: 0x%p+0x%p & ~0x%p != 0\n", (void *) dump_base, (void *) dump_size, (void *) (uintptr_t) VALMASK); goto out; -- 2.39.5