diff options
| author | Jan Niklas Hasse <jhasse@bixense.com> | 2019-11-16 17:46:41 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-16 17:46:41 (GMT) |
| commit | 2d15b04e411229cb902332957281622119025e77 (patch) | |
| tree | d2ec8bcc0fc89a4703779420d3061ae28fdc9d3c /src | |
| parent | 8486a8886e444713017dea52707519c37d6213b4 (diff) | |
| parent | f8497798a3cb2528faaec8a38acee12f554caf41 (diff) | |
| download | Ninja-2d15b04e411229cb902332957281622119025e77.zip Ninja-2d15b04e411229cb902332957281622119025e77.tar.gz Ninja-2d15b04e411229cb902332957281622119025e77.tar.bz2 | |
Merge pull request #1680 from jonesmz/patch-1
Fix invalid preprocessor #if
Diffstat (limited to 'src')
| -rw-r--r-- | src/graph.cc | 2 | ||||
| -rw-r--r-- | src/graph_test.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/graph.cc b/src/graph.cc index facb76d..3214513 100644 --- a/src/graph.cc +++ b/src/graph.cc @@ -383,7 +383,7 @@ std::string EdgeEnv::MakePathList(const Node* const* const span, result.push_back(sep); const string& path = (*i)->PathDecanonicalized(); if (escape_in_out_ == kShellEscape) { -#if _WIN32 +#ifdef _WIN32 GetWin32EscapedString(path, &result); #else GetShellEscapedString(path, &result); diff --git a/src/graph_test.cc b/src/graph_test.cc index c8cca1c..660943f 100644 --- a/src/graph_test.cc +++ b/src/graph_test.cc @@ -218,7 +218,7 @@ TEST_F(GraphTest, VarInOutPathEscaping) { "build a$ b: cat no'space with$ space$$ no\"space2\n")); Edge* edge = GetNode("a b")->in_edge(); -#if _WIN32 +#ifdef _WIN32 EXPECT_EQ("cat no'space \"with space$\" \"no\\\"space2\" > \"a b\"", edge->EvaluateCommand()); #else |