summaryrefslogtreecommitdiffstats
path: root/clang/lib/Headers/stddef.h
diff options
context:
space:
mode:
authorAnders Carlsson <andersca@mac.com>2008-11-04 06:53:14 +0000
committerAnders Carlsson <andersca@mac.com>2008-11-04 06:53:14 +0000
commit6b0dc8511964ebf3cd7b988dfa7e40eb3ab3d228 (patch)
treeba126206daa3da4e9918c0acb0b2490793ca5551 /clang/lib/Headers/stddef.h
parent09053e62a93fb694b60d4e9cae741190db0200ba (diff)
downloadbcm5719-llvm-6b0dc8511964ebf3cd7b988dfa7e40eb3ab3d228.tar.gz
bcm5719-llvm-6b0dc8511964ebf3cd7b988dfa7e40eb3ab3d228.zip
#define NULL as 0 when compiling as C++. This fixes the carbon.cpp and cocoa.mm test failures.
llvm-svn: 58685
Diffstat (limited to 'clang/lib/Headers/stddef.h')
-rw-r--r--clang/lib/Headers/stddef.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/clang/lib/Headers/stddef.h b/clang/lib/Headers/stddef.h
index 3e7e4dda0d2..d5f4eb9c7c2 100644
--- a/clang/lib/Headers/stddef.h
+++ b/clang/lib/Headers/stddef.h
@@ -32,7 +32,12 @@ typedef __typeof__(sizeof(int)) size_t;
typedef __typeof__(*L"") wchar_t;
#endif
+#ifdef __cplusplus
+#define NULL (0)
+#else
#define NULL ((void*)0)
+#endif
+
#define offsetof(t, d) __builtin_offsetof(t, d)
#endif /* __STDDEF_H */
OpenPOWER on IntegriCloud