[ros-diffs] [gadamopoulos] 50708: [shell32] - Fix some compilation issues with msc