summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2017-05-06 15:29:16 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2017-05-06 15:33:16 -0700
commitf31689c803a13836ef3528d6e2b4c98c767c42c7 (patch)
tree83ae3d2fb1a5b6d014dfda3fb781558e552f8680
parent7cd7f5b4032092389a00e23af3ab435628febed3 (diff)
downloademacs-f31689c803a13836ef3528d6e2b4c98c767c42c7.tar.gz
Port .gdbinit to GDB 7.11.1 + Python 2.7.12
* src/.gdbinit (Lisp_Object_Printer.to_string): Explicitly convert integer val to 'int', so that older GDBs do not complain about the conversion. * src/lisp.h (Lisp_Object) [CHECK_LISP_OBJECT_TYPE]: Give the struct a tag, so that older GDB pretty-printers have a tag to hang their hat on.
-rw-r--r--src/.gdbinit2
-rw-r--r--src/lisp.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/.gdbinit b/src/.gdbinit
index 29689e20a95..80aa95ba405 100644
--- a/src/.gdbinit
+++ b/src/.gdbinit
@@ -1311,7 +1311,7 @@ if hasattr(gdb, 'printing'):
# pretty-printing could be fancier.
if not val:
return "XIL(0)" # Easier to read than "XIL(0x0)".
- return "XIL(0x%x)" % val
+ return "XIL(0x%x)" % int(val)
def build_pretty_printer ():
pp = Emacs_Pretty_Printers ("Emacs")
diff --git a/src/lisp.h b/src/lisp.h
index 5d4c64a2e50..de3a548cb6c 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -546,7 +546,7 @@ enum Lisp_Fwd_Type
#ifdef CHECK_LISP_OBJECT_TYPE
-typedef struct { EMACS_INT i; } Lisp_Object;
+typedef struct Lisp_Object { EMACS_INT i; } Lisp_Object;
#define LISP_INITIALLY(i) {i}