PR c++/20499
	* parser.c (cp_parser_class_head): Return NULL_TREE when
	encountering a redefinition.

	* g++.dg/parse/error16.C: Tweak error markers.

From-SVN: r96870