diff options
| author | Paul Eggert | 2019-07-23 11:18:16 -0700 |
|---|---|---|
| committer | Paul Eggert | 2019-07-23 11:18:58 -0700 |
| commit | a48726ebae2f44ed15b97cb72bc7eca199d8de47 (patch) | |
| tree | 169d78ee718c9e8617df4de4175e0d82056f863f /src/pdumper.c | |
| parent | 3479ec7332a474b3400cbc6b681c2a1f5637db94 (diff) | |
| download | emacs-a48726ebae2f44ed15b97cb72bc7eca199d8de47.tar.gz emacs-a48726ebae2f44ed15b97cb72bc7eca199d8de47.zip | |
Merge pdumper.c and alloc.c builtin symbol tests
* src/alloc.c (c_symbol_p): Move from here ...
* src/lisp.h (c_symbol_p): ... to here, and make it more portable
to hypothetical platforms where pointers are wider than ptrdiff_t.
* src/pdumper.c (dump_builtin_symbol_p): Use c_symbol_p.
Diffstat (limited to 'src/pdumper.c')
| -rw-r--r-- | src/pdumper.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/pdumper.c b/src/pdumper.c index 84147353e85..ddf44a53f86 100644 --- a/src/pdumper.c +++ b/src/pdumper.c | |||
| @@ -719,12 +719,7 @@ emacs_offset (const void *emacs_ptr) | |||
| 719 | static bool | 719 | static bool |
| 720 | dump_builtin_symbol_p (Lisp_Object object) | 720 | dump_builtin_symbol_p (Lisp_Object object) |
| 721 | { | 721 | { |
| 722 | if (!SYMBOLP (object)) | 722 | return SYMBOLP (object) && c_symbol_p (XSYMBOL (object)); |
| 723 | return false; | ||
| 724 | char *bp = (char *) lispsym; | ||
| 725 | struct Lisp_Symbol *s = XSYMBOL (object); | ||
| 726 | char *sp = (char *) s; | ||
| 727 | return bp <= sp && sp < bp + sizeof (lispsym); | ||
| 728 | } | 723 | } |
| 729 | 724 | ||
| 730 | /* Return whether OBJECT has the same bit pattern in all Emacs | 725 | /* Return whether OBJECT has the same bit pattern in all Emacs |