c-typeck.c (build_conditional_expr): When merging type qualifiers for conditional...

c-typeck.c (build_conditional_expr): When merging type qualifiers for conditional expressions between a pointer and...

	* c-typeck.c (build_conditional_expr): When merging type
	qualifiers for conditional expressions between a pointer and a
	pointer to a void type, merge the qualifiers on the target types
	rather than the pointer type.  Remove obsolete conditioned out
	code.

testsuite:
	* gcc.dg/c99-condexpr-1.c: New test.

From-SVN: r37589