diff options
| author | Nico Weber <nicolasweber@gmx.de> | 2012-04-24 21:27:01 +0000 |
|---|---|---|
| committer | Nico Weber <nicolasweber@gmx.de> | 2012-04-24 21:27:01 +0000 |
| commit | 1d725ecf93037e8877286f53a7289f39064a9fc5 (patch) | |
| tree | 7eb0aad6461a68499a4b1cc213d11a0ab8c85443 /clang/lib/Headers/stddef.h | |
| parent | a8022fa70de20171d95d54d6921d7a32d7108a77 (diff) | |
| download | bcm5719-llvm-1d725ecf93037e8877286f53a7289f39064a9fc5.tar.gz bcm5719-llvm-1d725ecf93037e8877286f53a7289f39064a9fc5.zip | |
Let NULL and MSVC headers coexist better.
Fixes the two issues mentioned in PR12146.
llvm-svn: 155490
Diffstat (limited to 'clang/lib/Headers/stddef.h')
| -rw-r--r-- | clang/lib/Headers/stddef.h | 9 |
1 files changed, 6 insertions, 3 deletions
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) |
