Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Windows build and add AppVeyor support #9863

Merged
merged 2 commits into from Mar 4, 2016
Merged
Changes from 1 commit
Commits
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

Prev

Fix build on Windows

  • Loading branch information
UK992 authored and larsbergstrom committed Mar 3, 2016
commit 5d24f7c6b7fd4b9d6402a4287377402b40adbad1
@@ -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 })
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.