diff options
| author | Nico Weber <nicolasweber@gmx.de> | 2012-08-05 19:02:01 (GMT) |
|---|---|---|
| committer | Nico Weber <nicolasweber@gmx.de> | 2012-08-05 19:07:53 (GMT) |
| commit | de8d5080c592f6e1cf59689e321d4bd66ee73290 (patch) | |
| tree | 24099189576ba702bb976472afc607f6411d921d /src | |
| parent | ed07eb9f2f25ddee464e786f0f2f82e9e8a33e0a (diff) | |
| download | Ninja-de8d5080c592f6e1cf59689e321d4bd66ee73290.zip Ninja-de8d5080c592f6e1cf59689e321d4bd66ee73290.tar.gz Ninja-de8d5080c592f6e1cf59689e321d4bd66ee73290.tar.bz2 | |
Include unistd.h in files that use unlink() on OS X.
`man unlink` says this is necessary, and according to a report by
Claus Klein, omitting them breaks the build on OS X 10.5 with gcc 4.7
(see issue #396).
(On Windows, ninja's util.h includes a define for unlink.)
Diffstat (limited to 'src')
| -rw-r--r-- | src/build_log_perftest.cc | 4 | ||||
| -rw-r--r-- | src/build_log_test.cc | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/build_log_perftest.cc b/src/build_log_perftest.cc index 5755079..a09beb8 100644 --- a/src/build_log_perftest.cc +++ b/src/build_log_perftest.cc @@ -22,6 +22,10 @@ #include "util.h" #include "metrics.h" +#ifndef _WIN32 +#include <unistd.h> +#endif + const char kTestFilename[] = "BuildLogPerfTest-tempfile"; bool WriteTestData(string* err) { diff --git a/src/build_log_test.cc b/src/build_log_test.cc index 0225684..186dad9 100644 --- a/src/build_log_test.cc +++ b/src/build_log_test.cc @@ -20,9 +20,7 @@ #ifdef _WIN32 #include <fcntl.h> #include <share.h> -#endif - -#ifdef linux +#else #include <sys/types.h> #include <sys/stat.h> #include <unistd.h> |