servo: Merge #12968 - Do not define Pipeline::setup_common on Windows (from TyanNN:master); r=Ms2ger
authorTyanNN <tyannn@cocaine.ninja>
Tue, 23 Aug 2016 04:23:41 -0500
changeset 339550 7df62b40f0d0d8f07dfc062f4362aea689ddb396
parent 339549 5483d2e6a99edeb90d51a779dd6075a500df6438
child 339551 1bb33573bf05df1f57aa978e87b07ca898d9bb06
push id31307
push usergszorc@mozilla.com
push dateSat, 04 Feb 2017 00:59:06 +0000
treeherdermozilla-central@94079d43835f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersMs2ger
servo: Merge #12968 - Do not define Pipeline::setup_common on Windows (from TyanNN:master); r=Ms2ger Fixes #12856 --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [x] These changes fix #12856. <!-- Either: --> - [x] These changes do not require tests because it just removes the compiler warning <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> Source-Repo: https://github.com/servo/servo Source-Revision: 16a938aac41331df39b4e334d4c6fc479b81e51a
servo/components/constellation/pipeline.rs
--- a/servo/components/constellation/pipeline.rs
+++ b/servo/components/constellation/pipeline.rs
@@ -533,16 +533,17 @@ impl UnprivilegedPipelineContent {
     }
 
     #[cfg(target_os = "windows")]
     pub fn spawn_multiprocess(self) -> Result<ChildProcess, IOError> {
         error!("Multiprocess is not supported on Windows.");
         process::exit(1);
     }
 
+    #[cfg(not(windows))]
     fn setup_common<C: CommandMethods>(&self, command: &mut C, token: String) {
         C::arg(command, "--content-process");
         C::arg(command, token);
 
         if let Ok(value) = env::var("RUST_BACKTRACE") {
             C::env(command, "RUST_BACKTRACE", value);
         }