Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(347)

Side by Side Diff: chrome/browser/chromeos/process_proxy/process_output_watcher.cc

Issue 10451068: Fixing gcc 4.7 building problems. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Modified per Adam's comments Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chromeos/process_proxy/process_output_watcher.h" 5 #include "chrome/browser/chromeos/process_proxy/process_output_watcher.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cstdio> 8 #include <cstdio>
9 #include <cstring> 9 #include <cstring>
10 10
11 #include <sys/ioctl.h> 11 #include <sys/ioctl.h>
12 #include <sys/select.h> 12 #include <sys/select.h>
13 13
brettw 2012/05/29 19:30:46 No blank line here (all C includes to together).
Han 2012/05/29 20:57:04 Done.
14 #include <unistd.h>
15
14 #include "base/eintr_wrapper.h" 16 #include "base/eintr_wrapper.h"
15 #include "base/logging.h" 17 #include "base/logging.h"
16 18
17 namespace { 19 namespace {
18 20
19 void InitReadFdSet(int out_fd, int stop_fd, fd_set* set) { 21 void InitReadFdSet(int out_fd, int stop_fd, fd_set* set) {
20 FD_ZERO(set); 22 FD_ZERO(set);
21 if (out_fd != -1) 23 if (out_fd != -1)
22 FD_SET(out_fd, set); 24 FD_SET(out_fd, set);
23 FD_SET(stop_fd, set); 25 FD_SET(stop_fd, set);
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 CloseFd(fd); 108 CloseFd(fd);
107 109
108 // We have lost contact with the process, so report it. 110 // We have lost contact with the process, so report it.
109 on_read_callback_.Run(PROCESS_OUTPUT_TYPE_EXIT, ""); 111 on_read_callback_.Run(PROCESS_OUTPUT_TYPE_EXIT, "");
110 } 112 }
111 } 113 }
112 114
113 void ProcessOutputWatcher::OnStop() { 115 void ProcessOutputWatcher::OnStop() {
114 delete this; 116 delete this;
115 } 117 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698