1
0
Fork 0

Fix compilation on Windows

This commit is contained in:
Robbert van der Helm 2022-06-26 23:25:21 +02:00
parent 4b2435a791
commit 9fa305206c

View file

@ -83,7 +83,7 @@ pub fn setup_logger() {
#[cfg(target_os = "windows")] #[cfg(target_os = "windows")]
if nih_log_env_str.eq_ignore_ascii_case("windbg") || win_dbg_logger::is_debugger_present() { if nih_log_env_str.eq_ignore_ascii_case("windbg") || win_dbg_logger::is_debugger_present() {
win_dbg_logger::init(); win_dbg_logger::init();
log_panics::init(); log_panics();
return; return;
} }
@ -126,8 +126,12 @@ pub fn setup_logger() {
} }
} }
// This is copied from same as the `log_panics` crate, but it's wrapped in `permit_alloc()`. log_panics();
// Otherwise logging panics will trigger `assert_no_alloc` as this also allocates. }
/// This is copied from same as the `log_panics` crate, but it's wrapped in `permit_alloc()`.
/// Otherwise logging panics will trigger `assert_no_alloc` as this also allocates.
fn log_panics() {
std::panic::set_hook(Box::new(|info| { std::panic::set_hook(Box::new(|info| {
permit_alloc(|| { permit_alloc(|| {
// All of this is directly copied from `permit_no_alloc`, except that `error!()` became // All of this is directly copied from `permit_no_alloc`, except that `error!()` became