Commit 827c34f
committed
fix(xml): guard NOMINMAX so a consumer that already defines it still builds
XmlReader.cpp defined WIN32_LEAN_AND_MEAN and NOMINMAX unconditionally before
including <windows.h>. CNA compiles the whole tree with -DNOMINMAX on the
command line and with /W4 /WX, so MSVC reported the redefinition as C4005 and
/WX turned it into C2220 -- the CNA + sharp-runtime pair did not build at all
on Windows at these two HEADs.
Every other Windows translation unit here already uses the #ifndef guard,
Environment.cpp from this same series included; this file was the one that
missed it.
Linux is unaffected: the block is inside #if defined(_WIN32).1 parent a655630 commit 827c34f
1 file changed
Lines changed: 6 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
8 | 8 | | |
9 | 9 | | |
10 | 10 | | |
11 | | - | |
12 | | - | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
13 | 17 | | |
14 | 18 | | |
15 | 19 | | |
| |||
0 commit comments