[ros-diffs] [cfinck] 28406: Build fixes for Mac OS X, thanks to Alex