diff options
| author | Evan Martin <martine@danga.com> | 2012-05-02 03:30:17 (GMT) |
|---|---|---|
| committer | Evan Martin <martine@danga.com> | 2012-05-02 03:30:17 (GMT) |
| commit | 96b7eb7f23e4b079a8dd0f0b2496890121028eb4 (patch) | |
| tree | 9cfee6e1ffcdb65152a270903203e6dd8d0e5fd3 | |
| parent | 1acce043a7d004e72f4682974c703618027db29d (diff) | |
| parent | 5214b6664a42c28ac844acbed2cff84ae44abd16 (diff) | |
| download | Ninja-96b7eb7f23e4b079a8dd0f0b2496890121028eb4.zip Ninja-96b7eb7f23e4b079a8dd0f0b2496890121028eb4.tar.gz Ninja-96b7eb7f23e4b079a8dd0f0b2496890121028eb4.tar.bz2 | |
Merge pull request #284 from nico/fixwinbuild
Fix Windows build.
| -rw-r--r-- | src/build.h | 2 | ||||
| -rw-r--r-- | src/build_log.cc | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/build.h b/src/build.h index 407aecc..ddd9db8 100644 --- a/src/build.h +++ b/src/build.h @@ -193,7 +193,7 @@ struct BuildStatus { const char* progress_status_format_; #ifdef _WIN32 - HANDLE console_; + void* console_; #endif }; diff --git a/src/build_log.cc b/src/build_log.cc index 0cecd70..f5ba9a2 100644 --- a/src/build_log.cc +++ b/src/build_log.cc @@ -17,7 +17,10 @@ #include <errno.h> #include <stdlib.h> #include <string.h> + +#ifndef _WIN32 #include <unistd.h> +#endif #include "build.h" #include "graph.h" |