aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArgyrios Kyrtzidis <akyrtzi@gmail.com>2013-03-27 01:25:37 +0000
committerArgyrios Kyrtzidis <akyrtzi@gmail.com>2013-03-27 01:25:37 +0000
commit07ffbd74e2188a3a353e9957b9fa0e2f7424e1b4 (patch)
treed1a55d6e722e8d2e31aacac0d07f0c82554e87ed
parent52151fd57eaf40603fa8f1cd34dcb4ad5f7701b3 (diff)
[lib/Headers] Define NULL as __DARWIN_NULL when on __APPLE__.
This makes it identical with the system definition. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@178110 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--lib/Headers/stddef.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/Headers/stddef.h b/lib/Headers/stddef.h
index 52962248f6..a8d6bf4148 100644
--- a/lib/Headers/stddef.h
+++ b/lib/Headers/stddef.h
@@ -53,7 +53,9 @@ typedef __WCHAR_TYPE__ wchar_t;
#endif
#undef NULL
-#ifdef __cplusplus
+#if defined(__APPLE__) && defined(__DARWIN_NULL)
+# define NULL __DARWIN_NULL
+#elif defined(__cplusplus)
# if !defined(__MINGW32__) && !defined(_MSC_VER)
# define NULL __null
# else