Skip to content
This repository has been archived by the owner on Jul 10, 2023. It is now read-only.

Pass XFree param as '*mut _' to avoid c_void conflicts. #215

Merged
merged 3 commits into from Nov 19, 2015
Merged

Pass XFree param as '*mut _' to avoid c_void conflicts. #215

merged 3 commits into from Nov 19, 2015

Conversation

ghost
Copy link

@ghost ghost commented Nov 19, 2015

Review on Reviewable

@mrobinson
Copy link
Member

Is this due to conflicting versions of libc? I think that @larsbergstrom is working on this now, so it's probably best for him to review this one.

@ghost
Copy link
Author

ghost commented Nov 19, 2015

Exactly. x11-rs has been updated to use std::os::raw where possible and libc 0.2 where needed. This commit resolved the issues that occurred in my build of servo.

@larsbergstrom
Copy link
Contributor

@daggerbot Can you also change the version of libc requested to 0.2 (here: https://github.com/servo/rust-layers/blob/master/Cargo.toml#L12)? We're trying to do that for all our deps (see servo/servo#8608). Thanks!

@larsbergstrom
Copy link
Contributor

@bors-servo r+

Thanks a ton, @daggerbot!

@bors-servo
Copy link

📌 Commit 871f856 has been approved by larsbergstrom

@bors-servo
Copy link

⌛ Testing commit 871f856 with merge f8c085f...

bors-servo pushed a commit that referenced this pull request Nov 19, 2015
Auto merge of #215 - Daggerbot:pr, r=larsbergstrom
f8c085f 
Pass XFree param as '*mut _' to avoid c_void conflicts.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/rust-layers/215)
<!-- Reviewable:end -->
@bors-servo
Copy link

☀️ Test successful - travis

@bors-servo bors-servo merged commit 871f856 into servo:master Nov 19, 2015
@larsbergstrom larsbergstrom mentioned this pull request Nov 19, 2015
Merged
@ghost ghost mentioned this pull request Nov 19, 2015
Merged
@SimonSapin SimonSapin mentioned this pull request Nov 19, 2015
Closed
52 tasks
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@mrobinson @larsbergstrom @bors-servo @daggerbot