Skip to content

Commit

Permalink
wrap at 80 columns
Browse files Browse the repository at this point in the history
  • Loading branch information
evmar committed Jul 27, 2012
1 parent 7bf3541 commit adadf71
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
3 changes: 2 additions & 1 deletion bootstrap.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,8 @@ def run(*args, **kwargs):

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',
Expand Down
7 changes: 5 additions & 2 deletions src/subprocess-win32.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit adadf71

Please sign in to comment.