Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

move winsock2.h into .cpp and add macro guard for pollfds #1588

Merged
merged 1 commit into from
Jan 30, 2019
Merged

move winsock2.h into .cpp and add macro guard for pollfds #1588

merged 1 commit into from
Jan 30, 2019

Conversation

kejxu
Copy link
Contributor

@kejxu kejxu commented Jan 23, 2019

  • winsock2.h is not used in the header file, move into the .cpp file that actually uses it
  • the use of pollfds is guarded by macros, add _WINDOWS macro guard to fix build failure on Windows

@dirk-thomas
Copy link
Member

Thank you for the patch.

@dirk-thomas dirk-thomas merged commit 58acc17 into ros:melodic-devel Jan 30, 2019
@kejxu kejxu deleted the exclude_use_of_poll.h_on_Windows branch January 30, 2019 22:55
tahsinkose pushed a commit to tahsinkose/ros_comm that referenced this pull request Apr 15, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants