Also, improve the test for nasty macros to define min and max, so this will be caught in the future. Differential Revision: https://reviews.llvm.org/D128655
Reviewed By: var-const, #libc, ldionne Spies: sstefan1, ldionne, BRevzin, libcxx-commits, mgorny Differential Revision: https://reviews.llvm.org/D120637