◐ Shell
reader mode source ↗
Skip to content

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

Merged
serhiy-storchaka merged 1 commit into
python:masterfrom
embray:bpo-31878
Oct 27, 2017
Merged

bpo-31878: Fix _socket module compilation on Cygwin#4137
serhiy-storchaka merged 1 commit into
python:masterfrom
embray:bpo-31878

Conversation

@embray

@embray embray commented Oct 26, 2017 •
edited
Loading

Copy link
Copy Markdown
Contributor

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

serhiy-storchaka commented Oct 26, 2017

Copy link
Copy Markdown
Member

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

@serhiy-storchaka

serhiy-storchaka commented Oct 26, 2017

Copy link
Copy Markdown
Member

OS/2 support was removed in bpo-16135.

@vstinner

vstinner commented Oct 26, 2017

Copy link
Copy Markdown
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

embray commented Oct 27, 2017

Copy link
Copy Markdown
Contributor Author

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

embray commented Oct 27, 2017

Copy link
Copy Markdown
Contributor Author

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

@vstinner vstinner left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Hide comment

LGTM.

@embray

embray commented Oct 27, 2017

Copy link
Copy Markdown
Contributor Author

Thanks!

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

miss-islington commented Oct 27, 2017

Copy link
Copy Markdown
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

bedevere-bot commented Oct 27, 2017

Copy link
Copy Markdown

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

@vstinner

vstinner commented Oct 27, 2017

Copy link
Copy Markdown
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

vstinner commented Oct 27, 2017

Copy link
Copy Markdown
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

miss-islington commented Nov 4, 2017

Copy link
Copy Markdown
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

miss-islington commented Nov 4, 2017

Copy link
Copy Markdown
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