Make changes needed to get the Unicode branch to compile for Windows.
Authored by: david_costanzo 2019-06-23
Parent: [r4957]
Child: [r4959]