summaryrefslogtreecommitdiffstats
path: root/clang
diff options
context:
space:
mode:
authorChris Lattner <sabre@nondot.org>2010-08-03 22:13:56 +0000
committerChris Lattner <sabre@nondot.org>2010-08-03 22:13:56 +0000
commit38321174e09cde27318cf58f6b08e5bd7c92144c (patch)
tree290530f2dedac5cc98ebd55ae3bf0c0a589ee017 /clang
parentfee57bb464665a8ed52c9856123c1d19df04ff3b (diff)
downloadbcm5719-llvm-38321174e09cde27318cf58f6b08e5bd7c92144c.tar.gz
bcm5719-llvm-38321174e09cde27318cf58f6b08e5bd7c92144c.zip
add a hack for visual studio, fixing PR7796
llvm-svn: 110161
Diffstat (limited to 'clang')
-rw-r--r--clang/lib/Headers/stddef.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/clang/lib/Headers/stddef.h b/clang/lib/Headers/stddef.h
index b1d0d528746..fdd48159bab 100644
--- a/clang/lib/Headers/stddef.h
+++ b/clang/lib/Headers/stddef.h
@@ -40,6 +40,7 @@ typedef __typeof__(*L"") wchar_t;
#undef NULL
#ifdef __cplusplus
+#undef __null // VC++ hack.
#define NULL __null
#else
#define NULL ((void*)0)
OpenPOWER on IntegriCloud