| Index: content/browser/zygote_main_linux.cc
|
| diff --git a/content/browser/zygote_main_linux.cc b/content/browser/zygote_main_linux.cc
|
| index ef9dd0be039ba4e78c3f8936ccdde8b1e0b32aa7..b01e2ed165c225796c14c73a83abc3387053592f 100644
|
| --- a/content/browser/zygote_main_linux.cc
|
| +++ b/content/browser/zygote_main_linux.cc
|
| @@ -2,25 +2,17 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| +#include "content/browser/zygote_host_linux.h"
|
| +
|
| #include <dlfcn.h>
|
| #include <fcntl.h>
|
| #include <pthread.h>
|
| -#include <sys/epoll.h>
|
| -#include <sys/prctl.h>
|
| -#include <sys/signal.h>
|
| #include <sys/socket.h>
|
| #include <sys/stat.h>
|
| #include <sys/types.h>
|
| #include <sys/wait.h>
|
| #include <unistd.h>
|
|
|
| -#if defined(CHROMIUM_SELINUX)
|
| -#include <selinux/selinux.h>
|
| -#include <selinux/context.h>
|
| -#endif
|
| -
|
| -#include "content/browser/zygote_host_linux.h"
|
| -
|
| #include "base/basictypes.h"
|
| #include "base/command_line.h"
|
| #include "base/eintr_wrapper.h"
|
| @@ -52,6 +44,19 @@
|
| #include "skia/ext/SkFontHost_fontconfig_control.h"
|
| #include "unicode/timezone.h"
|
|
|
| +#if defined(OS_LINUX)
|
| +#include <sys/epoll.h>
|
| +#include <sys/prctl.h>
|
| +#include <sys/signal.h>
|
| +#else
|
| +#include <signal.h>
|
| +#endif
|
| +
|
| +#if defined(CHROMIUM_SELINUX)
|
| +#include <selinux/selinux.h>
|
| +#include <selinux/context.h>
|
| +#endif
|
| +
|
| #if defined(ARCH_CPU_X86_FAMILY) && !defined(CHROMIUM_SELINUX) && \
|
| !defined(__clang__)
|
| // The seccomp sandbox is enabled on all ia32 and x86-64 processor as long as
|
|
|