[ros-diffs] [royce] 18630: msvc6+psdk fix