1 files changed, 4 insertions, 2 deletions
diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp
index 73f25a95c6..4e31d03e0e 100644
--- a/lib/Sema/SemaDecl.cpp
+++ b/lib/Sema/SemaDecl.cpp
@@ -1258,8 +1258,10 @@ bool Sema::MergeFunctionDecl(FunctionDecl *New, Decl *OldD) {
       New->getStorageClass() == SC_Static &&
       Old->getStorageClass() != SC_Static &&
       !canRedefineFunction(Old, getLangOptions())) {
-    Diag(New->getLocation(), diag::err_static_non_static)
-      << New;
+    unsigned DiagID = diag::err_static_non_static;
+    if (getLangOptions().Microsoft)
+      DiagID = diag::warn_static_non_static;
+    Diag(New->getLocation(), DiagID) << New;
     Diag(Old->getLocation(), PrevDiag);
     return true;
   }