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

add fdopendir #550

Merged
merged 1 commit into from
Mar 24, 2017
Merged

add fdopendir #550

merged 1 commit into from
Mar 24, 2017

Conversation

Mic92
Copy link
Contributor

@Mic92 Mic92 commented Mar 13, 2017

No description provided.

src/unix/mod.rs Outdated
@@ -328,6 +328,10 @@ extern {
#[cfg_attr(all(target_os = "macos", target_arch = "x86"),
link_name = "fdopen$UNIX2003")]
pub fn fdopen(fd: ::c_int, mode: *const c_char) -> *mut ::FILE;

#[cfg(not(any(target_os = "macos", target_os = "ios")))]
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Should I define this function here or in every os module except macos?

Copy link
Member

Choose a reason for hiding this comment

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

Ah yeah let's just inline this definition in modules other than src/unix/bsd/apple

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

@Mic92 Mic92 force-pushed the fdopendir branch 2 times, most recently from c3955ee to 192a036 Compare March 13, 2017 20:21
@alexcrichton
Copy link
Member

@bors: r+

Thanks!

@bors
Copy link
Contributor

bors commented Mar 13, 2017

📌 Commit 192a036 has been approved by alexcrichton

@bors
Copy link
Contributor

bors commented Mar 13, 2017

⌛ Testing commit 192a036 with merge e0e94df...

bors added a commit that referenced this pull request Mar 13, 2017
@bors
Copy link
Contributor

bors commented Mar 13, 2017

💔 Test failed - status-travis

@alexcrichton
Copy link
Member

alexcrichton commented Mar 14, 2017 via email

@bors
Copy link
Contributor

bors commented Mar 15, 2017

⌛ Testing commit 192a036 with merge d93d72a...

bors added a commit that referenced this pull request Mar 15, 2017
@bors
Copy link
Contributor

bors commented Mar 15, 2017

💔 Test failed - status-travis

@alexcrichton
Copy link
Member

alexcrichton commented Mar 20, 2017 via email

@bors
Copy link
Contributor

bors commented Mar 20, 2017

⌛ Testing commit 192a036 with merge c0e5657...

bors added a commit that referenced this pull request Mar 20, 2017
@bors
Copy link
Contributor

bors commented Mar 20, 2017

💔 Test failed - status-travis

@alexcrichton
Copy link
Member

@bors: retry

@bors
Copy link
Contributor

bors commented Mar 23, 2017

⌛ Testing commit 192a036 with merge d909e8e...

bors added a commit that referenced this pull request Mar 23, 2017
@bors
Copy link
Contributor

bors commented Mar 23, 2017

💔 Test failed - status-appveyor

@alexcrichton
Copy link
Member

alexcrichton commented Mar 23, 2017 via email

@bors
Copy link
Contributor

bors commented Mar 23, 2017

🔒 Merge conflict

@bors
Copy link
Contributor

bors commented Mar 23, 2017

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

@Mic92
Copy link
Contributor Author

Mic92 commented Mar 24, 2017

fixed merge conflict.

@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Mar 24, 2017

📌 Commit 99a524d has been approved by alexcrichton

@bors
Copy link
Contributor

bors commented Mar 24, 2017

⌛ Testing commit 99a524d with merge 4e31314...

bors added a commit that referenced this pull request Mar 24, 2017
@bors
Copy link
Contributor

bors commented Mar 24, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: alexcrichton
Pushing 4e31314 to master...

@bors bors merged commit 99a524d into rust-lang:master Mar 24, 2017
@Mic92 Mic92 deleted the fdopendir branch March 25, 2017 01:10
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