diff options
Diffstat (limited to 'test/Sema/predefined-function.c')
| -rw-r--r-- | test/Sema/predefined-function.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/test/Sema/predefined-function.c b/test/Sema/predefined-function.c index d554b8faa8..1dcd1d38a2 100644 --- a/test/Sema/predefined-function.c +++ b/test/Sema/predefined-function.c @@ -4,13 +4,13 @@ char *funk(int format); enum Test {A=-1}; char *funk(enum Test x); -int eli(float b); // expected-error {{previous definition is here}} +int eli(float b); // expected-error {{previous declaration is here}} int b(int c) {return 1;} int foo(); int foo() { - int eli(int (int)); // expected-error {{redefinition of 'eli'}} + int eli(int (int)); // expected-error {{conflicting types for 'eli'}} eli(b); return 0; } @@ -20,19 +20,19 @@ int bar(int i) // expected-error {{previous definition is here}} { return 0; } -int bar() // expected-error {{redefinition of 'bar'}} +int bar() // expected-error {{redefinition of 'bar'}} expected-error {{conflicting types for 'bar'}} { return 0; } -int foobar(int); // expected-error {{previous definition is here}} -int foobar() // expected-error {{redefinition of 'foobar'}} +int foobar(int); // expected-error {{previous declaration is here}} +int foobar() // expected-error {{conflicting types for 'foobar'}} { return 0; } -int wibble(); // expected-error {{previous definition is here}} -float wibble() // expected-error {{redefinition of 'wibble'}} +int wibble(); // expected-error {{previous declaration is here}} +float wibble() // expected-error {{conflicting types for 'wibble'}} { return 0.0f; } |