From 3704c60135f96c02079274dad1a00b2dc3f846c9 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Thu, 19 Oct 2017 11:06:05 +0200 Subject: executor: fix build breakages due to doexit Some standard libraries contain "using ::exit;", which breaks with the current redefinition of exit. --- executor/common_windows.h | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'executor/common_windows.h') diff --git a/executor/common_windows.h b/executor/common_windows.h index 077bc874a..0edc473d7 100644 --- a/executor/common_windows.h +++ b/executor/common_windows.h @@ -5,7 +5,17 @@ #include -#define doexit exit +#if defined(SYZ_EXECUTOR) || (defined(SYZ_REPEAT) && defined(SYZ_WAIT_REPEAT)) || \ + defined(SYZ_USE_TMP_DIR) || defined(SYZ_HANDLE_SEGV) || defined(SYZ_TUN_ENABLE) || \ + defined(SYZ_SANDBOX_NAMESPACE) || defined(SYZ_SANDBOX_SETUID) || \ + defined(SYZ_SANDBOX_NONE) || defined(SYZ_FAULT_INJECTION) || defined(__NR_syz_kvm_setup_cpu) +__attribute__((noreturn)) static void doexit(int status) +{ + _exit(status); + for (;;) { + } +} +#endif #include "common.h" -- cgit mrf-deployment