From 065c9eb405d6b80fa96630a6f4b9c76dc6ab0486 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Wed, 4 Jul 2012 10:04:09 -0700 Subject: [PATCH] * emacs.c (gdb_pvec_type): Change it back to enum pvec_type. This variable's comment says Emacs needs at least one GDB-visible symbol of type enum pvec_type, to work around GDB problems. The symbol's value doesn't matter. --- src/ChangeLog | 5 +++++ src/emacs.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index 7f81f1e6b68..06f9f9370a0 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,10 @@ 2012-07-04 Paul Eggert + * emacs.c (gdb_pvec_type): Change it back to enum pvec_type. + This variable's comment says Emacs needs at least one GDB-visible + symbol of type enum pvec_type, to work around GDB problems. + The symbol's value doesn't matter. + * alloc.c (PSEUDOVECTOR_NBYTES): Remove stray ';' that causes compilation to fail on pre-C99 compilers. diff --git a/src/emacs.c b/src/emacs.c index 143a44e0847..861c19ee0b5 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -119,7 +119,7 @@ ptrdiff_t PVEC_FLAG EXTERNALLY_VISIBLE = PSEUDOVECTOR_FLAG; ptrdiff_t gdb_array_mark_flag EXTERNALLY_VISIBLE = ARRAY_MARK_FLAG; /* GDB might say "No enum type named pvec_type" if we don't have at least one symbol with that type, and then xbacktrace could fail. */ -ptrdiff_t gdb_pvec_type EXTERNALLY_VISIBLE = PVEC_TYPE_MASK; +enum pvec_type const gdb_pvec_type EXTERNALLY_VISIBLE = 0; /* Empty lisp strings. To avoid having to build any others. */ Lisp_Object empty_unibyte_string, empty_multibyte_string; -- 2.39.2