[ros-diffs] [royce] 18629: msvc6+PSDK fixes