diff options
Diffstat (limited to 'clang/lib')
| -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) |
