| Index: sandbox/linux/services/credentials.cc
|
| diff --git a/sandbox/linux/services/credentials.cc b/sandbox/linux/services/credentials.cc
|
| index b562d8b7c9650806573c2c31e5e4cdb9f25ce5e2..35bb4dcbd73fe99882deaf362dae473b9efd8c56 100644
|
| --- a/sandbox/linux/services/credentials.cc
|
| +++ b/sandbox/linux/services/credentials.cc
|
| @@ -27,16 +27,12 @@
|
| #include "sandbox/linux/services/syscall_wrappers.h"
|
| #include "sandbox/linux/services/thread_helpers.h"
|
| #include "sandbox/linux/system_headers/capability.h"
|
| +#include "sandbox/linux/system_headers/linux_signal.h"
|
|
|
| namespace sandbox {
|
|
|
| namespace {
|
|
|
| -// Signal ABI for some toolchain is incompatible with Linux's. In particular,
|
| -// PNaCl toolchain defines SIGCHLD = 20. So, here, directly define Linux's
|
| -// value.
|
| -const int kLinuxSIGCHLD = 17;
|
| -
|
| bool IsRunningOnValgrind() { return RUNNING_ON_VALGRIND; }
|
|
|
| // Checks that the set of RES-uids and the set of RES-gids have
|
| @@ -96,8 +92,8 @@ bool ChrootToSafeEmptyDir() {
|
| #endif
|
|
|
| pid = clone(ChrootToSelfFdinfo, stack,
|
| - CLONE_VM | CLONE_VFORK | CLONE_FS | kLinuxSIGCHLD,
|
| - nullptr, nullptr, nullptr, nullptr);
|
| + CLONE_VM | CLONE_VFORK | CLONE_FS | LINUX_SIGCHLD, nullptr,
|
| + nullptr, nullptr, nullptr);
|
| PCHECK(pid != -1);
|
|
|
| int status = -1;
|
|
|