[cherry-pick swift/release/6.0][clang][headers] Including stddef.h always redefines NULL #9003
Conversation
…ways redefines NULL stddef.h always includes __stddef_null.h. This is fine in modules because it's not possible to re-include the pcm, and it's necessary to export the _Builtin_stddef.null submodule. However, without modules it causes NULL to always get redefined which disrupts some C++ code. Rework the inclusion of __stddef_null.h so that with not building with modules it's only included if __need_NULL is set by the includer, or it's the first time stddef.h is being included. rdar://131450006
|
@swift-ci test |
|
Explanation: This fixes a regression from llvm#90676 where including <stddef.h> multiple times will overwrite the declaration of NULL. This breaks compiling gcc with clang. |
|
@swift-ci test llvm |
|
LLVM test failures look unrelated. Several |
stddef.h always includes __stddef_null.h. This is fine in modules because it's not possible to re-include the pcm, and it's necessary to export the _Builtin_stddef.null submodule. However, without modules it causes NULL to always get redefined which disrupts some C++ code. Rework the inclusion of __stddef_null.h so that with not building with modules it's only included if __need_NULL is set by the includer, or it's the first time stddef.h is being included.
rdar://131450006