diff options
Diffstat (limited to 'lib/Sema/SemaDecl.cpp')
| -rw-r--r-- | lib/Sema/SemaDecl.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp index e9922dfdf9..9429d4b413 100644 --- a/lib/Sema/SemaDecl.cpp +++ b/lib/Sema/SemaDecl.cpp @@ -220,11 +220,12 @@ 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; - + // TODO: CHECK FOR CONFLICTS, multiple decls with same name in one scope. // TODO: This is totally simplistic. It should handle merging functions // together etc, merging extern int X; int X; ... |