diff options
author | David Hill <dhill@conformal.com> | 2013-06-29 23:16:51 (GMT) |
---|---|---|
committer | David Hill <dhill@conformal.com> | 2013-06-29 23:16:51 (GMT) |
commit | cb85ce886da075a57ede902a5fe6b4e3507afb34 (patch) | |
tree | 3e790d4d885c88fb21efc977c5c20a85da54f651 /src | |
parent | 7b9b1fb94aa44784e33734bef68c76e6a43361ef (diff) | |
download | Ninja-cb85ce886da075a57ede902a5fe6b4e3507afb34.zip Ninja-cb85ce886da075a57ede902a5fe6b4e3507afb34.tar.gz Ninja-cb85ce886da075a57ede902a5fe6b4e3507afb34.tar.bz2 |
cleanup based on comments from martine
Diffstat (limited to 'src')
-rw-r--r-- | src/subprocess-posix.cc | 2 | ||||
-rw-r--r-- | src/subprocess_test.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/subprocess-posix.cc b/src/subprocess-posix.cc index ae010c9..cd22aa9 100644 --- a/src/subprocess-posix.cc +++ b/src/subprocess-posix.cc @@ -41,7 +41,7 @@ bool Subprocess::Start(SubprocessSet* set, const string& command) { Fatal("pipe: %s", strerror(errno)); fd_ = output_pipe[0]; #if !defined(USE_PPOLL) - // On Linux, OpenBSD and Bitrig, we use ppoll in DoWork(); elsewhere we use pselect + // If available, we use ppoll in DoWork(); otherwise we use pselect // and so must avoid overly-large FDs. if (fd_ >= static_cast<int>(FD_SETSIZE)) Fatal("pipe: %s", strerror(EMFILE)); diff --git a/src/subprocess_test.cc b/src/subprocess_test.cc index 7e98cad..9b903c8 100644 --- a/src/subprocess_test.cc +++ b/src/subprocess_test.cc @@ -152,7 +152,7 @@ TEST_F(SubprocessTest, SetWithMulti) { // OS X's process limit is less than 1025 by default // (|sysctl kern.maxprocperuid| is 709 on 10.7 and 10.8 and less prior to that). -#if defined(linux) || defined(__OpenBSD__) || defined(__Bitrig__) +if !defined(__APPLE__) TEST_F(SubprocessTest, SetWithLots) { // Arbitrary big number; needs to be over 1024 to confirm we're no longer // hostage to pselect. |