From 531b5368e2d232cc2697bc555dc481143ced0ca0 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Thu, 14 Nov 2019 17:14:29 +0100 Subject: executor: remove pointless macro checks common_bsd.h is used for 3 OSes, so checking if it's any of these 3 OSes is pointless. Remove these checks. --- pkg/csource/generated.go | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'pkg/csource/generated.go') diff --git a/pkg/csource/generated.go b/pkg/csource/generated.go index 987253a5e..050a36670 100644 --- a/pkg/csource/generated.go +++ b/pkg/csource/generated.go @@ -432,8 +432,6 @@ static uintptr_t syz_open_pts(void) #endif -#if GOOS_freebsd || GOOS_openbsd || GOOS_netbsd - #if SYZ_EXECUTOR || SYZ_TUN_ENABLE #include @@ -677,7 +675,6 @@ static long syz_extract_tcp_res(volatile long a0, volatile long a1, volatile lon return 0; } #endif -#endif #if SYZ_EXECUTOR || SYZ_SANDBOX_SETUID || SYZ_SANDBOX_NONE @@ -713,7 +710,7 @@ static void loop(); static int do_sandbox_none(void) { sandbox_common(); -#if (GOOS_freebsd || GOOS_openbsd || GOOS_netbsd) && (SYZ_EXECUTOR || SYZ_TUN_ENABLE) +#if SYZ_EXECUTOR || SYZ_TUN_ENABLE initialize_tun(procid); #endif loop(); @@ -748,7 +745,7 @@ static int do_sandbox_setuid(void) return wait_for_loop(pid); sandbox_common(); -#if (GOOS_freebsd || GOOS_openbsd || GOOS_netbsd) && (SYZ_EXECUTOR || SYZ_TUN_ENABLE) +#if SYZ_EXECUTOR || SYZ_TUN_ENABLE initialize_tun(procid); #endif -- cgit mrf-deployment