commit 2ba828f36ddad474c984992bde793211746ba8c8
author Steven Watanabe <steven@providere-consulting.com> Sun Sep 05 23:16:22 2010 +0000
committer Steven Watanabe <steven@providere-consulting.com> Sun Sep 05 23:16:22 2010 +0000
tree aeff6c2aa9d69956328a140a6936ff910acf68a4
parent f0b04973430d1acc9a5abae03a870467ed2a2861

Tell the VS headers that char16_t and char32_t are keywords, so yvals.h doesn't try to define them as typedefs.

llvm-svn: 113126

clang/lib/Frontend/InitPreprocessor.cpp

diff --git a/clang/lib/Frontend/InitPreprocessor.cpp b/clang/lib/Frontend/InitPreprocessor.cpp
index 0d07192..181f671 100644
--- a/clang/lib/Frontend/InitPreprocessor.cpp
+++ b/clang/lib/Frontend/InitPreprocessor.cpp
@@ -342,6 +342,10 @@
       Builder.defineMacro("_NATIVE_WCHAR_T_DEFINED");
       Builder.append("class type_info;");
     }
+
+    if (LangOpts.CPlusPlus0x) {
+      Builder.defineMacro("_HAS_CHAR16_T_LANGUAGE_SUPPORT", "1");
+    }
   }
 
   if (LangOpts.Optimize)