Cherry-picked to the 4.4 branch. (Those changes are in Windows-specific code, and introduced by people using MSVC, so I think they compile with MSVC; are there any Windows compilers with which C++-style comments don't work, and would that be an issue with UN*X compilers that don't support C++-style comments by default?)
Cherry-picked to the 4.4 branch. (Those changes are in Windows-specific code, and introduced by people using MSVC, so I think they compile with MSVC; are there any Windows compilers with which C++-style comments don't work, and would that be an issue with UN*X compilers that don't support C++-style comments by default?)