Alloc redeclaration of typedefs within ExternCSystemHeaderDir's AND SystemHeaderDir's.
llvm-svn: 48841
This commit is contained in:
parent
19e24df3a4
commit
c06ee808d7
|
@ -220,8 +220,9 @@ TypedefDecl *Sema::MergeTypeDefDecl(TypedefDecl *New, ScopedDecl *OldD) {
|
|||
DirectoryLookup::DirType OldDirType = HdrInfo.getFileDirFlavor(OldDeclFile);
|
||||
DirectoryLookup::DirType NewDirType = HdrInfo.getFileDirFlavor(NewDeclFile);
|
||||
|
||||
if ((OldDirType == DirectoryLookup::ExternCSystemHeaderDir ||
|
||||
NewDirType == DirectoryLookup::ExternCSystemHeaderDir) ||
|
||||
// Allow reclarations in both SystemHeaderDir and ExternCSystemHeaderDir.
|
||||
if ((OldDirType != DirectoryLookup::NormalHeaderDir ||
|
||||
NewDirType != DirectoryLookup::NormalHeaderDir) ||
|
||||
getLangOptions().Microsoft)
|
||||
return New;
|
||||
|
||||
|
|
Loading…
Reference in New Issue