diff options
| author | Evan Martin <martine@danga.com> | 2012-01-23 00:46:53 (GMT) |
|---|---|---|
| committer | Evan Martin <martine@danga.com> | 2012-01-23 00:46:53 (GMT) |
| commit | 133cba3f664b82be9dbeeff151f7cfb4b1065242 (patch) | |
| tree | ec702a0d4e2adfce9f55ae13882bd0d2b9e2520c | |
| parent | faac236d26b206cd6a8f4aa6e2bca8a83f0f83fa (diff) | |
| parent | 9b1c5d5ba78d83eb3977352ce2111d416922c6bb (diff) | |
| download | Ninja-133cba3f664b82be9dbeeff151f7cfb4b1065242.zip Ninja-133cba3f664b82be9dbeeff151f7cfb4b1065242.tar.gz Ninja-133cba3f664b82be9dbeeff151f7cfb4b1065242.tar.bz2 | |
Merge pull request #201 from syntheticpp/mingw-msvc
Some workarounds are only for msvc.
| -rw-r--r-- | src/ninja.cc | 2 | ||||
| -rw-r--r-- | src/util.h | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/ninja.cc b/src/ninja.cc index a599c6e..4e750f4 100644 --- a/src/ninja.cc +++ b/src/ninja.cc @@ -709,7 +709,7 @@ reload: printf("\n"); int count = (int)globals.state->paths_.size(); int buckets = -#ifdef _WIN32 +#ifdef _MSC_VER (int)globals.state->paths_.comp.bucket_size; #else (int)globals.state->paths_.bucket_count(); @@ -68,12 +68,14 @@ const char* SpellcheckString(const string& text, ...); /// Removes all Ansi escape codes (http://www.termsys.demon.co.uk/vtansi.htm). string StripAnsiEscapeCodes(const string& in); -#ifdef _WIN32 +#ifdef _MSC_VER #define snprintf _snprintf #define fileno _fileno #define unlink _unlink #define chdir _chdir +#endif +#ifdef _WIN32 /// Convert the value returned by GetLastError() into a string. string GetLastErrorString(); #endif |