PR c++/22233
	* pt.c (push_template_decl_real): Return error_mark_node if the
	number of template parameters does not match previous definition.

	* g++.dg/template/param1.C: New test.

From-SVN: r103339