commit 35bbf1cf8a2ec3bf2526f1982d97a9f6a5aec347
author Hans Wennborg <hans@hanshq.net> Tue Jun 10 20:46:38 2014 +0000
committer Hans Wennborg <hans@hanshq.net> Tue Jun 10 20:46:38 2014 +0000
tree 394695877e3b99189b0aa2774c8805803fc0a8b3
parent 826ba908e2313db7b79fd88f06108205cd323463

Do not predefine __EXCEPTIONS in clang-cl (PR19977)

Patch by Ehsan Akhgari! (Test tweak by me.)

Differential Revision: http://reviews.llvm.org/D4065

llvm-svn: 210582

clang/lib/Frontend/InitPreprocessor.cpp

diff --git a/clang/lib/Frontend/InitPreprocessor.cpp b/clang/lib/Frontend/InitPreprocessor.cpp
index fb52eb4..dbb59b4 100644
--- a/clang/lib/Frontend/InitPreprocessor.cpp
+++ b/clang/lib/Frontend/InitPreprocessor.cpp
@@ -491,7 +491,7 @@
     Builder.defineMacro("__BLOCKS__");
   }
 
-  if (LangOpts.CXXExceptions)
+  if (!LangOpts.MSVCCompat && LangOpts.CXXExceptions)
     Builder.defineMacro("__EXCEPTIONS");
   if (LangOpts.RTTI)
     Builder.defineMacro("__GXX_RTTI");