[ros-diffs] [cwittich] 27641: -fix some linux build issues