* configure.ac (DEBUGGER_SEES_C_MACROS): New macro.

* src/lisp.h (DEFINE_GDB_SYMBOL_BEGIN, DEFINE_GDB_SYMBOL_END):
Define to empty if DEBUGGER_SEES_C_MACROS is defined.
This avoids placing unnecessary constants into the Emacs code.

diff --git a/ChangeLog b/ChangeLog
index 95c10ec22a6632fa63b5101e282fc9e0a38b503b..506fa045864f7b1d8ad30a02f9f7b9a26bee886b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-11-15  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * configure.ac (DEBUGGER_SEES_C_MACROS): New macro.
+
 2013-11-14  Paul Eggert  <eggert@cs.ucla.edu>
 
        Simplify, port and tune bool vector implementation.

diff --git a/configure.ac b/configure.ac
index a9baf608bf382df8ac0db7a434d827a8a24f4fec..9c66a7d2d855d561efd4551a45aa108155982b50 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -697,6 +697,16 @@ if test "$ac_test_CFLAGS" != set; then
   esac
 fi
 
+for flag in $CFLAGS -; do
+  case $flag in
+    -g*3)
+      AC_DEFINE([DEBUGGER_SEES_C_MACROS], 1,
+        [Define to 1 if C macros are visible to the debugger, as with
+        GCC's -g3 option.])
+      break;;
+  esac
+done
+
 AC_ARG_ENABLE([gcc-warnings],
   [AS_HELP_STRING([--enable-gcc-warnings],
                   [turn on lots of GCC warnings/errors. This is intended for

diff --git a/src/ChangeLog b/src/ChangeLog
index fb262a6efb07851f034453715170035faab574dc..8131c7b7355e4bfa3e7f7fadb4b063ff9cbd9fd8 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2013-11-15  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * lisp.h (DEFINE_GDB_SYMBOL_BEGIN, DEFINE_GDB_SYMBOL_END):
+       Define to empty if DEBUGGER_SEES_C_MACROS is defined.
+       This avoids placing unnecessary constants into the Emacs code.
+
 2013-11-14  Kazuhiro Ito  <kzhr@d1.dion.ne.jp>  (tiny change)
 
        * keyboard.c (make_ctrl_char) [HAVE_NTGUI]: Now externally visible

diff --git a/src/lisp.h b/src/lisp.h
index 72e5dad8ca341489fde8e72492789ce4ff89d8cb..3eb31ac34be0dd665918c5b037aa8e9f1fda5771 100644 (file)
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -45,7 +45,7 @@ INLINE_HEADER_BEGIN
    definitions visible to the debugger.  It's used for symbols that
    .gdbinit needs, symbols whose values may not fit in 'int' (where an
    enum would suffice).  */
-#ifdef MAIN_PROGRAM
+#if defined MAIN_PROGRAM && !defined DEBUGGER_SEES_C_MACROS
 # define DEFINE_GDB_SYMBOL_BEGIN(type, id) type const id EXTERNALLY_VISIBLE
 # define DEFINE_GDB_SYMBOL_END(id) = id;
 #else