Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 22:15:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2918 from mbrubeck/size_t

Browse source 
Fix build errors for Android (and other 32-bit targets)
This commit is contained in:
Lars Bergstrom 2014-07-25 11:02:38 -05:00
commit df71ea8b08
4 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Makefile.in
View file

@ -409,7 +409,7 @@ package: servo
else ifeq ($(CFG_OSTYPE),linux-androideabi) else ifeq ($(CFG_OSTYPE),linux-androideabi)
package: servo package: servo
mkdir -p sofile mkdir -p sofile
find . ! \( \( -type d -path './sofile' -o -path './$(CFG_TARGET)/src/compiler/rust' \) -prune \) -name '*.so' -type f | xargs -I {} cp -f {} $(CFG_BUILD_HOME)sofile/ find . ! \( \( -type d -path './sofile' -o -path './$(CFG_TARGET)/src/compiler/rust' -o -path '*/host' \) -prune \) -name '*.so' -type f | xargs -I {} cp -f {} $(CFG_BUILD_HOME)sofile/
find $(CFG_RUST_HOME)/lib/rustlib/$(CFG_TARGET)/lib/ -name '*.so' -type f -size +1c | xargs -I {} cp -f {} $(CFG_BUILD_HOME)sofile/ find $(CFG_RUST_HOME)/lib/rustlib/$(CFG_TARGET)/lib/ -name '*.so' -type f -size +1c | xargs -I {} cp -f {} $(CFG_BUILD_HOME)sofile/
cd $(S)src/platform/android/servo-android-glue && make with-libs cd $(S)src/platform/android/servo-android-glue && make with-libs
cd $(CFG_BUILD_HOME) cd $(CFG_BUILD_HOME)

4
src/components/main/servo.rs
View file

@ -53,7 +53,7 @@ use servo_util::opts;
use url::{Url, UrlParser}; use url::{Url, UrlParser};
#[cfg(not(test), not(target_os="android"))] #[cfg(not(test))]
use std::os; use std::os;
#[cfg(not(test), target_os="android")] #[cfg(not(test), target_os="android")]
use std::str; use std::str;
@ -83,7 +83,7 @@ pub extern "C" fn android_start(argc: int, argv: **u8) -> int {
} }
} }
let mut opts = opts::from_cmdline_args(args.as_slice()); let opts = opts::from_cmdline_args(args.as_slice());
match opts { match opts {
Some(mut o) => { Some(mut o) => {
// Always use CPU rendering on android. // Always use CPU rendering on android.

2
src/components/util/memory.rs
View file

@ -156,7 +156,7 @@ fn get_jemalloc_stat(name: &'static str) -> Option<u64> {
unsafe { unsafe {
rv = je_mallctl(c_name.unwrap(), oldp, &mut oldlen, mut_null(), 0); rv = je_mallctl(c_name.unwrap(), oldp, &mut oldlen, mut_null(), 0);
} }
if rv == 0 { Some(old) } else { None } if rv == 0 { Some(old as u64) } else { None }
} }
// Like std::macros::try!, but for Option<>. // Like std::macros::try!, but for Option<>.

2
src/support/stringcache/string-cache

@ -1 +1 @@
Subproject commit 00caade726945dd8a7bbe81d4f8e77c0177d8ee3 Subproject commit be58e4527196b58cd2f9b19ddf53c8115af676b5