From 3704c60135f96c02079274dad1a00b2dc3f846c9 Mon Sep 17 00:00:00 2001
From: Dmitry Vyukov <dvyukov@google.com>
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.
---
 pkg/csource/linux_common.go | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'pkg/csource/linux_common.go')

diff --git a/pkg/csource/linux_common.go b/pkg/csource/linux_common.go
index acc1647e4..2d84a9fbd 100644
--- a/pkg/csource/linux_common.go
+++ b/pkg/csource/linux_common.go
@@ -119,11 +119,6 @@ __attribute__((noreturn)) static void doexit(int status)
 }
 #endif
 
-#if defined(SYZ_EXECUTOR)
-#define exit use_doexit_instead
-#define _exit use_doexit_instead
-#endif
-
 
 
 #include <stdint.h>
@@ -145,6 +140,11 @@ __attribute__((noreturn)) static void doexit(int status)
 #include <stdio.h>
 #endif
 
+#if defined(SYZ_EXECUTOR)
+#define exit vsnprintf
+#define _exit vsnprintf
+#endif
+
 #if defined(SYZ_EXECUTOR)
 #if defined(__GNUC__)
 #define SYSCALLAPI
-- 
cgit mrf-deployment