diff options
| -rw-r--r-- | lib/AST/ASTContext.cpp | 3 | ||||
| -rw-r--r-- | lib/Analysis/CFRefCount.cpp | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lib/AST/ASTContext.cpp b/lib/AST/ASTContext.cpp index e24de53314..4a84e3d66c 100644 --- a/lib/AST/ASTContext.cpp +++ b/lib/AST/ASTContext.cpp @@ -2816,7 +2816,7 @@ QualType ASTContext::mergeTypes(QualType LHS, QualType RHS) { if (areCompatVectorTypes(LHS->getAsVectorType(), RHS->getAsVectorType())) return LHS; return QualType(); - case Type::ObjCInterface: + case Type::ObjCInterface: { // Check if the interfaces are assignment compatible. const ObjCInterfaceType* LHSIface = LHS->getAsObjCInterfaceType(); const ObjCInterfaceType* RHSIface = RHS->getAsObjCInterfaceType(); @@ -2825,6 +2825,7 @@ QualType ASTContext::mergeTypes(QualType LHS, QualType RHS) { return LHS; return QualType(); + } case Type::ObjCQualifiedId: // Distinct qualified id's are not compatible. return QualType(); diff --git a/lib/Analysis/CFRefCount.cpp b/lib/Analysis/CFRefCount.cpp index 4d4bd059d7..a602de2dbc 100644 --- a/lib/Analysis/CFRefCount.cpp +++ b/lib/Analysis/CFRefCount.cpp @@ -35,6 +35,10 @@ using namespace clang; +#ifdef _MSC_VER +# define strncasecmp _strnicmp +#endif // #ifdef _MSC_VER + //===----------------------------------------------------------------------===// // Utility functions. //===----------------------------------------------------------------------===// |