(cherry picked from commit 73e2ccd603)
73e2ccd603
Fix typos in #if; add missing _MSC_VER; avoid warning in random generator.