Skip to content

bpo-31878: Fix _socket module compilation on Cygwin #4137

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
Oct 27, 2017
Merged

bpo-31878: Fix _socket module compilation on Cygwin #4137

merged 1 commit into from
Oct 27, 2017

Conversation

embray
Copy link
Contributor

@embray embray commented Oct 26, 2017 •
edited
Loading

In Cygwin, as on OSX, ioctl() is declared in sys/ioctl.h, and so needs this include. This is necessary for the _socket module to compile successfully on that platform.

https://bugs.python.org/issue31878

@serhiy-storchaka
Copy link
Member

I think it is better to remove PYCC_VACPP in a separate commit.

@serhiy-storchaka
Copy link
Member

OS/2 support was removed in bpo-16135.

@vstinner
Copy link
Member

I think it is better to remove PYCC_VACPP in a separate commit.

I agree, it's distributing to have both changes in the same PR.

Moreover, for the Cygwin PR, please explain your change in the commit message. Explain that your change adds the ioctl.h include on Cygwin.

@embray
Copy link
Contributor Author

embray commented Oct 27, 2017

It is in a separate commit, but the same PR. I will make a separate PR--it just seemed like very minor code cleanup.

@embray
Copy link
Contributor Author

embray commented Oct 27, 2017

Rebased: Dropped the PYCC_VACPP cleanup from this PR; the commit message already says I think all that needs to be said.

vstinner
vstinner approved these changes Oct 27, 2017
View reviewed changes
Copy link
Member

@vstinner vstinner left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

@embray
Copy link
Contributor Author

embray commented Oct 27, 2017

Thanks!

@serhiy-storchaka serhiy-storchaka merged commit 63ae044 into python:master Oct 27, 2017
@miss-islington
Copy link
Contributor

Thanks @embray for the PR, and @serhiy-storchaka for merging it 🌮🎉.. I'm working now to backport this PR to: 3.6.
🐍🍒⛏🤖

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Oct 27, 2017
@embray @miss-islington
Fix _socket module compilation on Cygwin. (pythonGH-4137)
67a2b0b 
(cherry picked from commit 63ae044)
@bedevere-bot
Copy link

GH-4145 is a backport of this pull request to the 3.6 branch.

@vstinner
Copy link
Member

GH-4145 is a backport of this pull request to the 3.6 branch.

Wait. For me, Cygwin means supporting a new platform. It was never supported officially. I'm against backporting such change.

@vstinner
Copy link
Member

"It is in a separate commit, but the same PR. I will make a separate PR--it just seemed like very minor code cleanup."

Please CC-me for your new "cleanup" PR, I like it ;-)

@embray embray deleted the bpo-31878 branch October 27, 2017 11:36
@embray embray mentioned this pull request Oct 27, 2017
Merged
@miss-islington
Copy link
Contributor

Thanks @embray for the PR, and @serhiy-storchaka for merging it 🌮🎉.. I'm working now to backport this PR to: 2.7.
🐍🍒⛏🤖

@miss-islington
Copy link
Contributor

Sorry, @embray and @serhiy-storchaka, I could not cleanly backport this to 2.7 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker 63ae04461fb0cc93ca57cd151103a8dd295581d6 2.7

serhiy-storchaka pushed a commit that referenced this pull request Feb 26, 2018
@miss-islington @serhiy-storchaka
Fix _socket module compilation on Cygwin. (GH-4137) (GH-4145)
e650fd3 
(cherry picked from commit 63ae044)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vstinner vstinner vstinner approved these changes

@serhiy-storchaka serhiy-storchaka serhiy-storchaka approved these changes

Assignees
No one assigned
Labels
skip news
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@embray @serhiy-storchaka @vstinner @miss-islington @bedevere-bot @the-knights-who-say-ni