summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbootstrap.py3
-rw-r--r--src/subprocess-win32.cc7
2 files changed, 7 insertions, 3 deletions
diff --git a/bootstrap.py b/bootstrap.py
index 9ac46ba..86d38d9 100755
--- a/bootstrap.py
+++ b/bootstrap.py
@@ -74,7 +74,8 @@ if sys.platform.startswith('win32'):
vcdir = os.environ.get('VCINSTALLDIR')
if vcdir:
- args = [os.path.join(vcdir, 'bin', 'cl.exe'), '/nologo', '/EHsc', '/DNOMINMAX']
+ args = [os.path.join(vcdir, 'bin', 'cl.exe'),
+ '/nologo', '/EHsc', '/DNOMINMAX']
else:
args = shlex.split(os.environ.get('CXX', 'g++'))
args.extend(['-Wno-deprecated',
diff --git a/src/subprocess-win32.cc b/src/subprocess-win32.cc
index 3484e5f..7dd8809 100644
--- a/src/subprocess-win32.cc
+++ b/src/subprocess-win32.cc
@@ -271,9 +271,12 @@ Subprocess* SubprocessSet::NextFinished() {
void SubprocessSet::Clear() {
for (vector<Subprocess*>::iterator i = running_.begin();
i != running_.end(); ++i) {
- if ((*i)->child_)
- if (!GenerateConsoleCtrlEvent(CTRL_BREAK_EVENT, GetProcessId((*i)->child_)))
+ if ((*i)->child_) {
+ if (!GenerateConsoleCtrlEvent(CTRL_BREAK_EVENT,
+ GetProcessId((*i)->child_))) {
Win32Fatal("GenerateConsoleCtrlEvent");
+ }
+ }
}
for (vector<Subprocess*>::iterator i = running_.begin();
i != running_.end(); ++i)