diff options
| author | Jan Niklas Hasse <jhasse@bixense.com> | 2018-11-05 19:47:30 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-05 19:47:30 (GMT) |
| commit | a3f284ac35a2a93b8f85edf7930c426cbc4402d7 (patch) | |
| tree | 6b39e1901337c2ce058cc762177d510520f6ccf2 | |
| parent | 9342a7e5ff660c421e9cedec6bb2d822dce9a7f8 (diff) | |
| parent | 2950bb1af9f00e30330de2d665be7317cf2b2ca3 (diff) | |
| download | Ninja-a3f284ac35a2a93b8f85edf7930c426cbc4402d7.zip Ninja-a3f284ac35a2a93b8f85edf7930c426cbc4402d7.tar.gz Ninja-a3f284ac35a2a93b8f85edf7930c426cbc4402d7.tar.bz2 | |
Merge pull request #1326 from 0-wiz-0/master
Two fixes for NetBSD
| -rwxr-xr-x | configure.py | 2 | ||||
| -rw-r--r-- | src/subprocess-posix.cc | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/configure.py b/configure.py index 5841f8d..cfe27f2 100755 --- a/configure.py +++ b/configure.py @@ -98,7 +98,7 @@ class Platform(object): return self._platform == 'aix' def uses_usr_local(self): - return self._platform in ('freebsd', 'openbsd', 'bitrig', 'dragonfly') + return self._platform in ('freebsd', 'openbsd', 'bitrig', 'dragonfly', 'netbsd') def supports_ppoll(self): return self._platform in ('freebsd', 'linux', 'openbsd', 'bitrig', diff --git a/src/subprocess-posix.cc b/src/subprocess-posix.cc index 53f5a3a..fc5543e 100644 --- a/src/subprocess-posix.cc +++ b/src/subprocess-posix.cc @@ -14,6 +14,7 @@ #include "subprocess.h" +#include <sys/select.h> #include <assert.h> #include <errno.h> #include <fcntl.h> |