diff options
| author | Evan Martin <martine@danga.com> | 2012-01-22 18:22:45 (GMT) |
|---|---|---|
| committer | Evan Martin <martine@danga.com> | 2012-01-22 18:22:45 (GMT) |
| commit | faac236d26b206cd6a8f4aa6e2bca8a83f0f83fa (patch) | |
| tree | bb1354e6bfb55e7540011806f3b511e79a10da63 /src/ninja.cc | |
| parent | 2ef3a546476987d6565141337c6309e7ae60f9fd (diff) | |
| download | Ninja-faac236d26b206cd6a8f4aa6e2bca8a83f0f83fa.zip Ninja-faac236d26b206cd6a8f4aa6e2bca8a83f0f83fa.tar.gz Ninja-faac236d26b206cd6a8f4aa6e2bca8a83f0f83fa.tar.bz2 | |
windows: use _WIN32 define everywhere
Rather than mixing use of WIN32 and _WIN32.
Diffstat (limited to 'src/ninja.cc')
| -rw-r--r-- | src/ninja.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/ninja.cc b/src/ninja.cc index b07c759..a599c6e 100644 --- a/src/ninja.cc +++ b/src/ninja.cc @@ -24,7 +24,7 @@ #include <sys/sysinfo.h> #endif -#ifdef WIN32 +#ifdef _WIN32 #include "getopt.h" #include <direct.h> #include <windows.h> @@ -107,7 +107,7 @@ int GuessParallelism() { NULL, 0) < 0) { processors = 1; } -#elif defined(WIN32) +#elif defined(_WIN32) SYSTEM_INFO info; GetSystemInfo(&info); processors = info.dwNumberOfProcessors; @@ -255,7 +255,7 @@ int ToolQuery(Globals* globals, int argc, char* argv[]) { return 0; } -#if !defined(WIN32) && !defined(NINJA_BOOTSTRAP) +#if !defined(_WIN32) && !defined(NINJA_BOOTSTRAP) int ToolBrowse(Globals* globals, int argc, char* argv[]) { if (argc < 1) { Error("expected a target to browse"); @@ -265,7 +265,7 @@ int ToolBrowse(Globals* globals, int argc, char* argv[]) { // If we get here, the browse failed. return 1; } -#endif // WIN32 +#endif // _WIN32 int ToolTargetsList(const vector<Node*>& nodes, int depth, int indent) { for (vector<Node*>::const_iterator n = nodes.begin(); @@ -475,7 +475,7 @@ int RunTool(const string& tool, Globals* globals, int argc, char** argv) { const char* desc; ToolFunc func; } tools[] = { -#if !defined(WIN32) && !defined(NINJA_BOOTSTRAP) +#if !defined(_WIN32) && !defined(NINJA_BOOTSTRAP) { "browse", "browse dependency graph in a web browser", ToolBrowse }, #endif |