summaryrefslogtreecommitdiffstats
path: root/src/subprocess.cc
diff options
context:
space:
mode:
authorEvan Martin <martine@danga.com>2011-11-06 00:02:06 (GMT)
committerEvan Martin <martine@danga.com>2011-11-06 00:02:06 (GMT)
commit21dfa6d7aa372545b153bcd822158cf91796461f (patch)
tree4c8b6895f0fb5880f34dd91701906905aa81f340 /src/subprocess.cc
parented6f49372d2be89130d007be173ba74d57e8ca3e (diff)
parent8bd34c537990b0be7fa0b80703c7afe8153758a6 (diff)
downloadNinja-21dfa6d7aa372545b153bcd822158cf91796461f.zip
Ninja-21dfa6d7aa372545b153bcd822158cf91796461f.tar.gz
Ninja-21dfa6d7aa372545b153bcd822158cf91796461f.tar.bz2
Merge pull request #127 from tiresdonexits/master
Minor code change to address a warning in g++ 4.6.
Diffstat (limited to 'src/subprocess.cc')
-rw-r--r--src/subprocess.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/subprocess.cc b/src/subprocess.cc
index 65322a6..74eded0 100644
--- a/src/subprocess.cc
+++ b/src/subprocess.cc
@@ -70,7 +70,7 @@ bool Subprocess::Start(SubprocessSet* set, const string& command) {
error_pipe = 2;
close(output_pipe[1]);
- execl("/bin/sh", "/bin/sh", "-c", command.c_str(), NULL);
+ execl("/bin/sh", "/bin/sh", "-c", command.c_str(), (char *) NULL);
} while (false);
// If we get here, something went wrong; the execl should have