Skip to content

Fix ios compilation #23372

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

Merged
merged 2 commits into from
Mar 15, 2015
Merged

Fix ios compilation #23372

merged 2 commits into from
Mar 15, 2015

Conversation

tamird
Copy link
Contributor

@tamird tamird commented Mar 14, 2015

@vhbit
Copy link
Contributor

vhbit commented Mar 15, 2015

  1. Such a huge whitespace/newline changes should be in a separate PR as they hide the intention and aren't relevant to iOS
  2. I wouldn't change dragonfly behavior without knowledge how it works and which constants it uses, i.e. it should remain as it is until maintainer decides to change it.
  3. Regarding iOS part everything is OK - this constant exists and while it practically useless, it's easier to enable it than to mess with conditional compilation on dependent modules.

@tamird
Copy link
Contributor Author

tamird commented Mar 15, 2015

Such a huge whitespace/newline changes should be in a separate PR as they hide the intention and aren't relevant to iOS

Yeah, maybe. It's in a separate commit, we'll see what @alexcrichton says.

I wouldn't change dragonfly behavior without knowledge how it works and which constants it uses, i.e. it should remain as it is until maintainer decides to change it.

I checked the dragonfly source, the constant is correct.

@alexcrichton
Copy link
Member

Yeah could the whitespace changes be refactored into a separate PR? Other than that this looks great, thanks!

tamird added 2 commits March 15, 2015 01:29
`sys/ttycom.h` in both:
`#define TIOCGWINSZ  _IOR('t', 104, struct winsize)  /* get window size */`
@tamird tamird force-pushed the fix-ios-compilation branch from 1e94ea4 to 04c947c Compare March 15, 2015 08:29
@tamird
Copy link
Contributor Author

tamird commented Mar 15, 2015

Done! #23385

@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Collaborator

bors commented Mar 15, 2015

@bors r=alexcrichton 04c947c

@bors
Copy link
Collaborator

bors commented Mar 15, 2015

⌛ Testing commit 04c947c with merge 95018ee...

@bors
Copy link
Collaborator

bors commented Mar 15, 2015

@bors bors merged commit 04c947c into rust-lang:master Mar 15, 2015
@tamird tamird deleted the fix-ios-compilation branch March 15, 2015 16:07
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.

4 participants