Let NULL and MSVC headers coexist better.

Fixes the two issues mentioned in PR12146.



git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@155490 91177308-0d34-0410-b5e6-96231b3b80d8
2 files changed