From 6b0dc8511964ebf3cd7b988dfa7e40eb3ab3d228 Mon Sep 17 00:00:00 2001
From: Anders Carlsson <andersca@mac.com>
Date: Tue, 4 Nov 2008 06:53:14 +0000
Subject: [PATCH] #define NULL as 0 when compiling as C++. This fixes the
 carbon.cpp and cocoa.mm test failures.

llvm-svn: 58685
---
 clang/lib/Headers/stddef.h | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/clang/lib/Headers/stddef.h b/clang/lib/Headers/stddef.h
index 3e7e4dda0d2e..d5f4eb9c7c29 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 */