From: Matthias Braun <matze@braunis.de>
Date: Mon, 12 Sep 2011 08:59:06 +0000 (+0200)
Subject: fix/improve double typedef exceptions
X-Git-Url: http://nsz.repo.hu/git/?a=commitdiff_plain;h=6fbac3d0d6bc7d1ae2e21f593b5c2af8f9d0c9b4;p=cparser

fix/improve double typedef exceptions
---

diff --git a/parser.c b/parser.c
index 37190b0..6cf1a1a 100644
--- a/parser.c
+++ b/parser.c
@@ -4107,12 +4107,16 @@ entity_t *record_entity(entity_t *entity, const bool is_definition)
 				type_t *const type      = skip_typeref(entity->typedefe.type);
 				type_t *const prev_type
 					= skip_typeref(previous_entity->typedefe.type);
-				/* gcc extension redef in system headers is allowed */
-				if ((!(c_mode & _CXX) && !pos->is_system_header)
-					|| !types_compatible(type, prev_type)) {
-					errorf(pos, "redefinition of '%N' (declared %P)",
-					       entity, ppos);
-				}
+				/* gcc extension: redef in system headers is allowed */
+				if ((pos->is_system_header || ppos->is_system_header)
+				    && types_compatible(type, prev_type))
+					goto finish;
+				/* c++ allows double typedef if they are identical
+				 * (after skipping typedefs) */
+				if ((c_mode & _CXX) && type == prev_type)
+					goto finish;
+				errorf(pos, "redefinition of '%N' (declared %P)",
+				       entity, ppos);
 				goto finish;
 			}