* c-exp.y, m2-exp.y: Define more yysymbols that happen to be

"bss" rather than "data" symbols, but which still conflict.
* m2-exp.y:  Lint.

diff --git a/gdb/c-exp.y b/gdb/c-exp.y
index 54ce28b34ae6b85482ef7b4cb9a91498fa1df773..a16c580107515885f2157819e1b46d7ad30d749c 100644 (file)
--- a/gdb/c-exp.y
+++ b/gdb/c-exp.y
@@ -57,6 +57,14 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #define        yyexca  c_exca
 #define yyerrflag c_errflag
 #define yynerrs        c_nerrs
+#define        yyps    c_ps
+#define        yypv    c_pv
+#define        yys     c_s
+#define        yystate c_state
+#define        yytmp   c_tmp
+#define        yyv     c_v
+#define        yyval   c_val
+#define        yylloc  c_lloc
 
 /* Forward decls */
 void yyerror ();

diff --git a/gdb/m2-exp.y b/gdb/m2-exp.y
index ce81e63c99bb5d7297c30ca371ec01558a9d0679..2c5cf4b9a50e7c3b9460d3df297240dbd4a378ca 100644 (file)
--- a/gdb/m2-exp.y
+++ b/gdb/m2-exp.y
@@ -37,6 +37,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include "frame.h"
 #include "expression.h"
 #include "language.h"
+#include "value.h"
 #include "parser-defs.h"
 
 /* These MUST be included in any grammar file!!!!
@@ -57,6 +58,14 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #define        yyexca  m2_exca
 #define yyerrflag m2_errflag
 #define yynerrs        m2_nerrs
+#define        yyps    m2_ps
+#define        yypv    m2_pv
+#define        yys     m2_s
+#define        yystate m2_state
+#define        yytmp   m2_tmp
+#define        yyv     m2_v
+#define        yyval   m2_val
+#define        yylloc  m2_lloc
 
 /* Forward decl's */
 void yyerror ();
@@ -653,7 +662,6 @@ parse_number (olen)
   register int c,i,ischar=0;
   register int base = input_radix;
   register int len = olen;
-  char *err_copy;
   int unsigned_p = number_sign == 1 ? 1 : 0;
 
   extern double atof ();