Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-05 14:33:38 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #18737 - paulrouget:rm_errno_location, r=emilio

Browse source 
remove android specific workaround

https://github.com/lfairy/rust-errno/pull/5 has landed.

I tested on Android. It runs.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/18737)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-10-06 10:09:40 -05:00 • committed by GitHub
commit cfca26a7e0
1 changed files with 0 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

10
components/servo/lib.rs
View file

@ -650,16 +650,6 @@ pub fn run_content_process(token: String) {
script::script_thread::ScriptThread>(true); script::script_thread::ScriptThread>(true);
} }
// This is a workaround for https://github.com/rust-lang/rust/pull/30175 until
// https://github.com/lfairy/rust-errno/pull/5 lands, and should be removed once
// we update Servo with the rust-errno crate.
#[cfg(target_os = "android")]
#[no_mangle]
pub unsafe extern fn __errno_location() -> *mut i32 {
extern { fn __errno() -> *mut i32; }
__errno()
}
#[cfg(all(not(target_os = "windows"), not(target_os = "ios")))] #[cfg(all(not(target_os = "windows"), not(target_os = "ios")))]
fn create_sandbox() { fn create_sandbox() {
ChildSandbox::new(content_process_sandbox_profile()).activate() ChildSandbox::new(content_process_sandbox_profile()).activate()