* ada-exp.y (yyname, yyrule): Remap global variables that appear

when YYDEBUG is set to 1.
* c-exp.y: Likewise.
* f-exp.y: Likewise.
* jv-exp.y: Likewise.
* m2-exp.y: Likewise.
* p-exp.y: Likewise.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 308ce31..82ca55c 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,15 @@
 2002-09-02  Jason Thorpe  <thorpej@wasabisystems.com>
 
+       * ada-exp.y (yyname, yyrule): Remap global variables that appear
+       when YYDEBUG is set to 1.  
+       * c-exp.y: Likewise.
+       * f-exp.y: Likewise.
+       * jv-exp.y: Likewise.
+       * m2-exp.y: Likewise.
+       * p-exp.y: Likewise.
+
+2002-09-02  Jason Thorpe  <thorpej@wasabisystems.com>
+
        * Makefile.in (i386nbsd-tdep.o): Add $(solib_svr4_h) to
        dependency list.
        * i386nbsd-tdep.c (i386nbsdelf_init_abi): Set

diff --git a/gdb/ada-exp.y b/gdb/ada-exp.y
index 67185a3..2e34e01 100644 (file)
--- a/gdb/ada-exp.y
+++ b/gdb/ada-exp.y
@@ -90,6 +90,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #define        yylloc  ada_lloc
 #define yyreds ada_reds                /* With YYDEBUG defined */
 #define yytoks ada_toks                /* With YYDEBUG defined */
+#define yyname ada_name                /* With YYDEBUG defined */
+#define yyrule ada_rule                /* With YYDEBUG defined */
 
 #ifndef YYDEBUG
 #define        YYDEBUG 1               /* Default to yydebug support */

diff --git a/gdb/c-exp.y b/gdb/c-exp.y
index ea50836..c6fc52c 100644 (file)
--- a/gdb/c-exp.y
+++ b/gdb/c-exp.y
@@ -89,6 +89,8 @@ extern int hp_som_som_object_present;
 #define        yylloc  c_lloc
 #define yyreds c_reds          /* With YYDEBUG defined */
 #define yytoks c_toks          /* With YYDEBUG defined */
+#define yyname c_name          /* With YYDEBUG defined */
+#define yyrule c_rule          /* With YYDEBUG defined */
 #define yylhs  c_yylhs
 #define yylen  c_yylen
 #define yydefred c_yydefred

diff --git a/gdb/f-exp.y b/gdb/f-exp.y
index a26f019..b900426 100644 (file)
--- a/gdb/f-exp.y
+++ b/gdb/f-exp.y
@@ -91,6 +91,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #define        yylloc  f_lloc
 #define yyreds f_reds          /* With YYDEBUG defined */
 #define yytoks f_toks          /* With YYDEBUG defined */
+#define yyname f_name          /* With YYDEBUG defined */
+#define yyrule f_rule          /* With YYDEBUG defined */
 #define yylhs  f_yylhs
 #define yylen  f_yylen
 #define yydefred f_yydefred

diff --git a/gdb/jv-exp.y b/gdb/jv-exp.y
index c2e5d16..70c228b 100644 (file)
--- a/gdb/jv-exp.y
+++ b/gdb/jv-exp.y
@@ -85,6 +85,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #define        yylloc  java_lloc
 #define yyreds java_reds               /* With YYDEBUG defined */
 #define yytoks java_toks               /* With YYDEBUG defined */
+#define yyname java_name               /* With YYDEBUG defined */
+#define yyrule java_rule               /* With YYDEBUG defined */
 #define yylhs  java_yylhs
 #define yylen  java_yylen
 #define yydefred java_yydefred

diff --git a/gdb/m2-exp.y b/gdb/m2-exp.y
index 707c9e2..e291d62 100644 (file)
--- a/gdb/m2-exp.y
+++ b/gdb/m2-exp.y
@@ -87,6 +87,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #define        yylloc  m2_lloc
 #define        yyreds  m2_reds         /* With YYDEBUG defined */
 #define        yytoks  m2_toks         /* With YYDEBUG defined */
+#define yyname m2_name         /* With YYDEBUG defined */
+#define yyrule m2_rule         /* With YYDEBUG defined */
 #define yylhs  m2_yylhs
 #define yylen  m2_yylen
 #define yydefred m2_yydefred

diff --git a/gdb/p-exp.y b/gdb/p-exp.y
index fbdd3f6..f0939e7 100644 (file)
--- a/gdb/p-exp.y
+++ b/gdb/p-exp.y
@@ -93,6 +93,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #define        yylloc  pascal_lloc
 #define yyreds pascal_reds             /* With YYDEBUG defined */
 #define yytoks pascal_toks             /* With YYDEBUG defined */
+#define yyname pascal_name             /* With YYDEBUG defined */
+#define yyrule pascal_rule             /* With YYDEBUG defined */
 #define yylhs  pascal_yylhs
 #define yylen  pascal_yylen
 #define yydefred pascal_yydefred