Fix PR2042. One remaining issue: we don't currently diagnose

 int foobar(int);
 int foobar() {}

which requires ifdef'ing out a testcase in predefined-function.c.

llvm-svn: 47236