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.



git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@47236 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/test/Sema/predefined-function.c b/test/Sema/predefined-function.c
index 1dcd1d3..daade82 100644
--- a/test/Sema/predefined-function.c
+++ b/test/Sema/predefined-function.c
@@ -20,16 +20,18 @@
 {
 	return 0;
 }
-int bar() // expected-error {{redefinition of 'bar'}} expected-error {{conflicting types for 'bar'}}
+int bar() // expected-error {{redefinition of 'bar'}} 
 {
 	return 0;
 }
 
+#if 0
 int foobar(int); // expected-error {{previous declaration is here}}
 int foobar() // expected-error {{conflicting types for 'foobar'}}
 {
 	return 0;
 }
+#endif
 
 int wibble(); // expected-error {{previous declaration is here}}
 float wibble() // expected-error {{conflicting types for 'wibble'}}