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

Moved inotify declarations up so that it works on android too. #1256

Merged
merged 5 commits into from
Feb 19, 2019

Conversation

vdagonneau
Copy link
Contributor

Following my previous pull request to include inotify bindings, I would like to move the code so that it benefits android too.

@rust-highfive
Copy link

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @gnzlbg (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@bors
Copy link
Contributor

bors commented Feb 18, 2019

☔ The latest upstream changes (presumably #1231) made this pull request unmergeable. Please resolve the merge conflicts.

vdagonneau and others added 3 commits February 19, 2019 09:38
…ific linux and android targets because the second argument has a different type in android and linux.
@gnzlbg
Copy link
Contributor

gnzlbg commented Feb 19, 2019

@bors: r+

@bors
Copy link
Contributor

bors commented Feb 19, 2019

📌 Commit d25a054 has been approved by gnzlbg

@bors
Copy link
Contributor

bors commented Feb 19, 2019

⌛ Testing commit d25a054 with merge 501ca54...

bors added a commit that referenced this pull request Feb 19, 2019
Moved inotify declarations up so that it works on android too.

Following my previous pull request to include inotify bindings, I would like to move the code so that it benefits android too.
@bors
Copy link
Contributor

bors commented Feb 19, 2019

☀️ Test successful - checks-cirrus, checks-travis, status-appveyor
Approved by: gnzlbg
Pushing 501ca54 to master...

@bors bors merged commit d25a054 into rust-lang:master Feb 19, 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.

4 participants