From 9e9b256b83d1d74249e890d20bb2d81852171969 Mon Sep 17 00:00:00 2001 From: strawberry Date: Sun, 16 Jun 2024 15:20:57 -0400 Subject: [PATCH] temp: comment out hardened_malloc code sorry but this is just non-functional in our build system, i haven't had time to figure out why nix doesn't like what i'm doing with it, and i haven't heard anyone using this (the user who i anticipated would use this has not updated their conduwuit in many months) Signed-off-by: strawberry --- src/core/alloc/mod.rs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/core/alloc/mod.rs b/src/core/alloc/mod.rs index ceb9f498..4c42b1e6 100644 --- a/src/core/alloc/mod.rs +++ b/src/core/alloc/mod.rs @@ -7,10 +7,12 @@ pub mod je; pub use je::{memory_stats, memory_usage}; // hardened_malloc -#[cfg(all(not(target_env = "msvc"), feature = "hardened_malloc", target_os = "linux", not(feature = "jemalloc")))] -pub mod hardened; -#[cfg(all(not(target_env = "msvc"), feature = "hardened_malloc", target_os = "linux", not(feature = "jemalloc")))] -pub use hardened::{memory_stats, memory_usage}; +//#[cfg(all(not(target_env = "msvc"), feature = "hardened_malloc", target_os = +//#[cfg(all(not(target_env "linux", not(feature = "jemalloc")))] +//pub mod hardened; +//#[cfg(all(not(target_env = "msvc"), feature = "hardened_malloc", target_os = +//#[cfg(all(not(target_env "linux", not(feature = "jemalloc")))] +//pub use hardened::{memory_stats, memory_usage}; // default, enabled when none or multiple of the above are enabled #[cfg(any(