aboutsummaryrefslogtreecommitdiff
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
commit04f5db699e5c1198f30cba17fd12f38805ab04df (patch)
treec4f944ef9cf6f2761ce14f336e9b4c057cf4795c
parent7e35274df4a598d5e3e4b8b5567bcb256fc2ab2f (diff)
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. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@178181 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--lib/Headers/stddef.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/Headers/stddef.h b/lib/Headers/stddef.h
index a8d6bf4148..52962248f6 100644
--- a/lib/Headers/stddef.h
+++ b/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