diff --git a/libmemunreachable/ScopedSignalHandler.h b/libmemunreachable/ScopedSignalHandler.h index ada2ae4ef..fab38ed3e 100644 --- a/libmemunreachable/ScopedSignalHandler.h +++ b/libmemunreachable/ScopedSignalHandler.h @@ -37,7 +37,7 @@ class ScopedSignalHandler { template void install(int signal, F&& f) { - MEM_LOG_ALWAYS_FATAL_IF(signal_ != -1, "ScopedSignalHandler already installed"); + if (signal != -1) MEM_LOG_ALWAYS_FATAL("ScopedSignalHandler already installed"); handler_ = SignalFn(std::allocator_arg, allocator_, [=](int signal, siginfo_t* si, void* uctx) { f(*this, signal, si, uctx); }); diff --git a/libmemunreachable/log.h b/libmemunreachable/log.h index 1725c53d7..10b83db21 100644 --- a/libmemunreachable/log.h +++ b/libmemunreachable/log.h @@ -30,9 +30,6 @@ #define MEM_LOG_ALWAYS_FATAL(...) async_safe_fatal(__VA_ARGS__) -#define MEM_LOG_ALWAYS_FATAL_IF(cond, ...) \ - ((__predict_false(cond)) ? async_safe_fatal(__VA_ARGS__) : (void)0) - #else #include @@ -43,7 +40,6 @@ #define MEM_ALOGI ALOGI #define MEM_LOG_ALWAYS_FATAL LOG_ALWAYS_FATAL -#define MEM_LOG_ALWAYS_FATAL_IF LOG_ALWAYS_FATAL_IF #endif