#define yyerrflag and yynerrs to avoid global name conflicts.

diff --git a/gdb/c-exp.y b/gdb/c-exp.y
index c7cf672..54ce28b 100644 (file)
--- a/gdb/c-exp.y
+++ b/gdb/c-exp.y
@@ -55,6 +55,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #define        yypgo   c_pgo           
 #define        yyact   c_act           
 #define        yyexca  c_exca
+#define yyerrflag c_errflag
+#define yynerrs        c_nerrs
 
 /* Forward decls */
 void yyerror ();

diff --git a/gdb/m2-exp.y b/gdb/m2-exp.y
index 5beefe6..ce81e63 100644 (file)
--- a/gdb/m2-exp.y
+++ b/gdb/m2-exp.y
@@ -55,6 +55,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #define        yypgo   m2_pgo
 #define        yyact   m2_act
 #define        yyexca  m2_exca
+#define yyerrflag m2_errflag
+#define yynerrs        m2_nerrs
 
 /* Forward decl's */
 void yyerror ();