[ros-diffs] [cwittich] 19786: fix macro redefinition when compiling with msvc