Merge pull request #17658 from CarolEidt/UnixDefines2