diff options
Diffstat (limited to 'clang/test/Sema/merge-decls.c')
| -rw-r--r-- | clang/test/Sema/merge-decls.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/clang/test/Sema/merge-decls.c b/clang/test/Sema/merge-decls.c index 22026e7f258..50ce4787699 100644 --- a/clang/test/Sema/merge-decls.c +++ b/clang/test/Sema/merge-decls.c @@ -3,9 +3,9 @@ void foo(void); void foo(void) {} void foo(void); -void foo(void); // expected-error{{previous definition is here}} +void foo(void); // expected-error{{previous declaration is here}} -void foo(int); // expected-error {{redefinition of 'foo'}} +void foo(int); // expected-error {{conflicting types for 'foo'}} int funcdef() { |
