summaryrefslogtreecommitdiffstats
path: root/clang
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
commit0909d3c5eda84e75a8071ba44479b0f3ab0eb1f7 (patch)
treebbb43e71d7519bf8cfb55226420a06242ffb2cf0 /clang
parent3a9c42c423b98b4857478c6200b5f81717f7b252 (diff)
downloadbcm5719-llvm-0909d3c5eda84e75a8071ba44479b0f3ab0eb1f7.tar.gz
bcm5719-llvm-0909d3c5eda84e75a8071ba44479b0f3ab0eb1f7.zip
[lib/Headers] Define NULL as __DARWIN_NULL when on __APPLE__.
This makes it identical with the system definition. llvm-svn: 178110
Diffstat (limited to 'clang')
-rw-r--r--clang/lib/Headers/stddef.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/clang/lib/Headers/stddef.h b/clang/lib/Headers/stddef.h
index 52962248f67..a8d6bf41488 100644
--- a/clang/lib/Headers/stddef.h
+++ b/clang/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
OpenPOWER on IntegriCloud