From 1d725ecf93037e8877286f53a7289f39064a9fc5 Mon Sep 17 00:00:00 2001
From: Nico Weber <nicolasweber@gmx.de>
Date: Tue, 24 Apr 2012 21:27:01 +0000
Subject: Let NULL and MSVC headers coexist better.

Fixes the two issues mentioned in PR12146.

llvm-svn: 155490
---
 clang/lib/Headers/stddef.h | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'clang/lib/Headers/stddef.h')

diff --git a/clang/lib/Headers/stddef.h b/clang/lib/Headers/stddef.h
index 9e87ee89b3b..d7db826e676 100644
--- a/clang/lib/Headers/stddef.h
+++ b/clang/lib/Headers/stddef.h
@@ -43,10 +43,13 @@ typedef __WCHAR_TYPE__ wchar_t;
 
 #undef NULL
 #ifdef __cplusplus
-#undef __null  // VC++ hack.
-#define NULL __null
+#  if !defined(__MINGW32__) && !defined(_MSC_VER)
+#    define NULL __null
+#  else
+#    define NULL 0
+#  endif
 #else
-#define NULL ((void*)0)
+#  define NULL ((void*)0)
 #endif
 
 #define offsetof(t, d) __builtin_offsetof(t, d)
-- 
cgit v1.2.3