Warn instead of error on duplicate protocol definitions.

Be kind to so many projects which are doing this (and be
like gcc).

llvm-svn: 68474

2 files changed, 2 insertions, 2 deletions

diff --git a/clang/test/SemaObjC/check-dup-objc-decls-1.m b/clang/test/SemaObjC/check-dup-objc-decls-1.m
index 4181ac097b4..dc9c8f44261 100644
--- a/clang/test/SemaObjC/check-dup-objc-decls-1.m
+++ b/clang/test/SemaObjC/check-dup-objc-decls-1.m
@@ -33,7 +33,7 @@ void Gorf() // expected-error {{redefinition of 'Gorf' as different kind of symb
 @interface A<Q> @end  // expected-error {{duplicate interface definition for class 'A'}}
 
 @protocol PP<P> @end  // expected-note {{previous definition is here}}
-@protocol PP<Q> @end  // expected-error {{duplicate protocol definition of 'PP'}}
+@protocol PP<Q> @end  // expected-warning {{duplicate protocol definition of 'PP'}}
 
 @interface A(Cat)<P> @end // expected-note {{previous definition is here}}
 @interface A(Cat)<Q> @end // expected-warning {{duplicate definition of category 'Cat' on interface 'A'}}
diff --git a/clang/test/SemaObjC/protocol-test-2.m b/clang/test/SemaObjC/protocol-test-2.m
index a882809f1c7..3abb9b59351 100644
--- a/clang/test/SemaObjC/protocol-test-2.m
+++ b/clang/test/SemaObjC/protocol-test-2.m
@@ -18,7 +18,7 @@
 @protocol PROTO<p1>     // expected-note {{previous definition is here}}
 @end
 
-@protocol PROTO<p1>	// expected-error {{duplicate protocol definition of 'PROTO'}}
+@protocol PROTO<p1>	// expected-warning {{duplicate protocol definition of 'PROTO'}}
 @end
 
 @protocol PROTO3<p1, p1>