Simplify cfgs

Signed-off-by: James Sturtevant <[email protected]>
Signed-off-by: James Sturtevant <[email protected]>

crates/containerd-shim-wasm/src/lib.rs

@@ -8,5 +8,5 @@ pub mod sandbox;
 mod macros;
 pub mod services;
 
-#[cfg(feature = "libcontainer")]
+#[cfg(all(feature = "libcontainer", not(target_os = "windows")))]
 pub mod libcontainer_instance;

crates/containerd-shim-wasm/src/libcontainer_instance/container_executor.rs

@@ -1,4 +1,3 @@
-#![cfg(unix)]
 use crate::sandbox::oci;
 use libcontainer::workload::default::DefaultExecutor;
 use libcontainer::workload::{Executor, ExecutorError};

crates/containerd-shim-wasm/src/libcontainer_instance/instance.rs

@@ -1,4 +1,3 @@
-#![cfg(unix)]
 //! Abstractions for running/managing a wasm/wasi instance that uses youki's libcontainer library.
 
 use anyhow::Context;

crates/containerd-shim-wasm/src/libcontainer_instance/mod.rs

@@ -1,5 +1,3 @@
-#![cfg(unix)]
-
 pub mod container_executor;
 pub mod instance;
 

crates/containerd-shim-wasm/src/sandbox/instance.rs

@@ -14,6 +14,8 @@ pub type ExitCode = Arc<(Mutex<Option<(u32, DateTime<Utc>)>>, Condvar)>;
 
 #[cfg(unix)]
 use libc::SIGKILL;
+#[cfg(windows)]
+const SIGKILL: i32 = 9;
 
 /// Generic options builder for creating a wasm instance.
 /// This is passed to the `Instance::new` method.
@@ -192,7 +194,6 @@ impl Instance for Nop {
     }
     fn kill(&self, signal: u32) -> Result<(), Error> {
         let code = match signal as i32 {
-            #[cfg(unix)]
             SIGKILL => 137,
             SIGINT | SIGTERM => 0,
             s => {
@@ -226,7 +227,6 @@ mod noptests {
 
     use super::*;
 
-    #[cfg(unix)]
     #[test]
     fn test_nop_kill_sigkill() -> Result<(), Error> {
         let nop = Nop::new("".to_string(), None);