re PR c++/48647 ([C++0x] SFINAE does not handle incompatible pointer types well in conditional operator)

	PR c++/48647
	* typeck.c (composite_pointer_type_r): Return error_mark_node
	on error in SFINAE context.

From-SVN: r174031