cvs server: conflicts found in gcc/c-parse.c

[Adam P. Jenkins]

Jason Merrill writes:
 > >>>>> Gerald Pfeifer <pfeifer@dbai.tuwien.ac.at> writes:
 > 
 > > Oops. Sorry, that happend as to read the entry in `cvs log` as 
 > >   c-parse.c (undeclared variable error): Tweak error mess...
 > > instead of
 > >   c-parse.y (undeclared variable error): Tweak error mess...
 > > thus believing that someone had changed the .c file.
 > 
 > Why is anyone changing c-parse.y?  It's generated from c-parse.in.  As is
 > objc/objc-parse.y, which also seems to have been modified.  These changes
 > should be moved to c-parse.in:
 > 
 > Wed Feb 25 01:31:40 1998  Jeffrey A Law  (law@cygnus.com)
 > 
 >         * c-parse.y (undeclared variable error): Tweak error message
 >         to be clearer.
 > 
 > Thu Dec 11 23:06:48 1997  H.J. Lu  (hjl@gnu.ai.mit.edu)
 > 
 >         * objc/objc-parse.y: Include "output.h".
 >         (yyerror): Remove redundant decl.
 >         (yyprint): Fix prototype.
 >         (apply_args_register_offset): Remove redundant decl.
 >         (get_file_function_name): Likewise.
 > 

Maybe c-parse.y should be removed from the repository, if it's a
generated file.  That would solve this problem.

Adam