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

Auto merge of #7051 - larsbergstrom:android_updates, r=mbrubeck

Browse source 
Update submodules and don't call setrlimit on Android

r? @mbrubeck 

Fixes #6432.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7051)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-08-07 19:54:27 -06:00
commit c528039a53
4 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/script/lib.rs
View file

@ -95,7 +95,7 @@ mod devtools;
mod horribly_inefficient_timers;
mod webdriver_handlers;
#[cfg(any(target_os="linux", target_os="android"))]
#[cfg(target_os="linux")]
#[allow(unsafe_code)]
fn perform_platform_specific_initialization() {
use std::mem;
@ -111,7 +111,7 @@ fn perform_platform_specific_initialization() {
}
}
#[cfg(not(any(target_os="linux", target_os="android")))]
#[cfg(not(target_os="linux"))]
fn perform_platform_specific_initialization() {}
#[allow(unsafe_code)]