diff options
| author | Abramo Bagnara <abramo.bagnara@gmail.com> | 2012-09-05 17:30:57 +0000 |
|---|---|---|
| committer | Abramo Bagnara <abramo.bagnara@gmail.com> | 2012-09-05 17:30:57 +0000 |
| commit | 73bf7f5b5b3eb18397e1e582049385a434a0763a (patch) | |
| tree | 74f2ddc14edb3290a125aa945d676fb0988b9476 /clang/lib/Frontend/InitPreprocessor.cpp | |
| parent | fcdda36149ba4428bef3c6e3985f086c7b5cd939 (diff) | |
| download | llvm-73bf7f5b5b3eb18397e1e582049385a434a0763a.zip llvm-73bf7f5b5b3eb18397e1e582049385a434a0763a.tar.gz llvm-73bf7f5b5b3eb18397e1e582049385a434a0763a.tar.bz2 | |
Allow disabling of wchar_t type.
llvm-svn: 163221
Diffstat (limited to 'clang/lib/Frontend/InitPreprocessor.cpp')
| -rw-r--r-- | clang/lib/Frontend/InitPreprocessor.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/clang/lib/Frontend/InitPreprocessor.cpp b/clang/lib/Frontend/InitPreprocessor.cpp index e24aebd..6aeb05f 100644 --- a/clang/lib/Frontend/InitPreprocessor.cpp +++ b/clang/lib/Frontend/InitPreprocessor.cpp @@ -420,11 +420,13 @@ static void InitializePredefinedMacros(const TargetInfo &TI, // Both __PRETTY_FUNCTION__ and __FUNCTION__ are GCC extensions, however // VC++ appears to only like __FUNCTION__. Builder.defineMacro("__PRETTY_FUNCTION__", "__FUNCTION__"); - // Work around some issues with Visual C++ headerws. - if (LangOpts.CPlusPlus) { - // Since we define wchar_t in C++ mode. + // Work around some issues with Visual C++ headers. + if (LangOpts.WChar) { + // wchar_t supported as a keyword. Builder.defineMacro("_WCHAR_T_DEFINED"); Builder.defineMacro("_NATIVE_WCHAR_T_DEFINED"); + } + if (LangOpts.CPlusPlus) { // FIXME: Support Microsoft's __identifier extension in the lexer. Builder.append("#define __identifier(x) x"); Builder.append("class type_info;"); |