windows.h doesn't have to be included in platform.h since it's not used by all the files referencing platform.h. WIN32_LEAN_AND_MEAN and NOMINMAX are changed to be added in catkin. _WINSOCKAPI_ is not really necessary since winsock2.h (mentioned in the comment) is not being included.
getenv
fromstdlib.h
is always used in the code (https://github.com/ros/roscpp_core/blob/kinetic-devel/cpp_common/include/ros/platform.h#L68), remove the_MSC_VER
checkwindows.h
doesn't have to be included inplatform.h
since it's not used by all the files referencingplatform.h
.WIN32_LEAN_AND_MEAN
andNOMINMAX
are changed to be added incatkin
._WINSOCKAPI_
is not really necessary sincewinsock2.h
(mentioned in the comment) is not being included.