From: Cedric Venet <cedric.venet@laposte.net>
Date: Sat, 21 Feb 2009 17:14:49 +0000 (+0000)
Subject: Fix build on windows.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=61490e9a965cfee8a78c12c6802138844f04250d;p=clang

Fix build on windows.

Should clang have a config.h or should we use the config.h of llvm or using the preprocessor is OK?  I did a quick fix here, but having a guideline on how to handle non portable function would be great (or ask ted to stop breaking the windows build :)).

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@65233 91177308-0d34-0410-b5e6-96231b3b80d8
---

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.
 //===----------------------------------------------------------------------===//