summaryrefslogtreecommitdiffstats
path: root/clang/lib/Frontend/InitPreprocessor.cpp
diff options
context:
space:
mode:
authorSteve Naroff <snaroff@apple.com>2009-12-04 21:29:41 +0000
committerSteve Naroff <snaroff@apple.com>2009-12-04 21:29:41 +0000
commitf0df20a5ba7fcb5ebd996b9530262b0f1885cf2d (patch)
tree5215af28e1e8373b3e8053b2b1b58e7a5510ebc4 /clang/lib/Frontend/InitPreprocessor.cpp
parent3ce3af2cb6f41cc265e3ff179edc961156b32223 (diff)
downloadbcm5719-llvm-f0df20a5ba7fcb5ebd996b9530262b0f1885cf2d.tar.gz
bcm5719-llvm-f0df20a5ba7fcb5ebd996b9530262b0f1885cf2d.zip
Integrate the following from the 'objective-rewrite' branch:
http://llvm.org/viewvc/llvm-project?view=rev&revision=70926 llvm-svn: 90596
Diffstat (limited to 'clang/lib/Frontend/InitPreprocessor.cpp')
-rw-r--r--clang/lib/Frontend/InitPreprocessor.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/clang/lib/Frontend/InitPreprocessor.cpp b/clang/lib/Frontend/InitPreprocessor.cpp
index a9ca762cc12..c1fc92d3b0c 100644
--- a/clang/lib/Frontend/InitPreprocessor.cpp
+++ b/clang/lib/Frontend/InitPreprocessor.cpp
@@ -362,6 +362,9 @@ static void InitializePredefinedMacros(const TargetInfo &TI,
DefineBuiltinMacro(Buf, "__int16=__INT16_TYPE__");
DefineBuiltinMacro(Buf, "__int32=__INT32_TYPE__");
DefineBuiltinMacro(Buf, "__int64=__INT64_TYPE__");
+ // Both __PRETTY_FUNCTION__ and __FUNCTION__ are GCC extensions, however
+ // VC++ appears to only like __FUNCTION__.
+ DefineBuiltinMacro(Buf, "__PRETTY_FUNCTION__=__FUNCTION__");
// Work around some issues with Visual C++ headerws.
if (LangOpts.CPlusPlus) {
// Since we define wchar_t in C++ mode.
OpenPOWER on IntegriCloud