mirror of
https://github.com/servo/servo.git
synced 2025-08-06 06:00:15 +01:00
Auto merge of #9863 - larsbergstrom:appveyor2, r=edunham
Fix Windows build and add AppVeyor support Proof of success: https://ci.appveyor.com/project/larsbergstrom/servo/build/1.0.15 Fixes #9767 <!-- Reviewable:start --> [<img src="https://reviewable.io/review_button.svg" height="40" alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9863) <!-- Reviewable:end -->
This commit is contained in:
commit
08b9fe0c00
3 changed files with 40 additions and 0 deletions
|
@ -8,6 +8,7 @@
|
|||
#![feature(plugin)]
|
||||
#![plugin(plugins)]
|
||||
|
||||
#[cfg(not(target_os = "windows"))]
|
||||
extern crate alloc_jemalloc;
|
||||
extern crate hbs_pow;
|
||||
extern crate ipc_channel;
|
||||
|
|
|
@ -463,6 +463,7 @@ mod system_reporter {
|
|||
newp: *mut c_void, newlen: size_t) -> c_int;
|
||||
}
|
||||
|
||||
#[cfg(not(target_os = "windows"))]
|
||||
fn jemalloc_stat(value_name: &str) -> Option<usize> {
|
||||
// Before we request the measurement of interest, we first send an "epoch"
|
||||
// request. Without that jemalloc gives cached statistics(!) which can be
|
||||
|
@ -498,6 +499,11 @@ mod system_reporter {
|
|||
Some(value as usize)
|
||||
}
|
||||
|
||||
#[cfg(target_os = "windows")]
|
||||
fn jemalloc_stat(value_name: &str) -> Option<usize> {
|
||||
None
|
||||
}
|
||||
|
||||
// Like std::macros::try!, but for Option<>.
|
||||
macro_rules! option_try(
|
||||
($e:expr) => (match $e { Some(e) => e, None => return None })
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue