summaryrefslogtreecommitdiffstats
path: root/clang/lib
diff options
context:
space:
mode:
authorArgyrios Kyrtzidis <akyrtzi@gmail.com>2013-03-27 21:22:45 +0000
committerArgyrios Kyrtzidis <akyrtzi@gmail.com>2013-03-27 21:22:45 +0000
commit95aa0b77f25c863e80a0b3921b2fdc83f97eab21 (patch)
tree63d0dfb3a49133c80ca827037d40e7d7b83eafa7 /clang/lib
parent37714b8a481e608651a5900860c63e627ce03082 (diff)
downloadbcm5719-llvm-95aa0b77f25c863e80a0b3921b2fdc83f97eab21.tar.gz
bcm5719-llvm-95aa0b77f25c863e80a0b3921b2fdc83f97eab21.zip
Revert "[lib/Headers] Define NULL as __DARWIN_NULL when on __APPLE__."
Per feedback by Doug, we should avoid platform-specific implementations in lib/Headers as much as possible. This reverts commit r178110. llvm-svn: 178181
Diffstat (limited to 'clang/lib')
-rw-r--r--clang/lib/Headers/stddef.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/clang/lib/Headers/stddef.h b/clang/lib/Headers/stddef.h
index a8d6bf41488..52962248f67 100644
--- a/clang/lib/Headers/stddef.h
+++ b/clang/lib/Headers/stddef.h
@@ -53,9 +53,7 @@ typedef __WCHAR_TYPE__ wchar_t;
#endif
#undef NULL
-#if defined(__APPLE__) && defined(__DARWIN_NULL)
-# define NULL __DARWIN_NULL
-#elif defined(__cplusplus)
+#ifdef __cplusplus
# if !defined(__MINGW32__) && !defined(_MSC_VER)
# define NULL __null
# else
OpenPOWER on IntegriCloud