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

Side by Side Diff: tools/android/forwarder2/socket.cc

Issue 11896088: Fix android build error with gcc 4.7.2 (Closed) Base URL: https://src.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 11 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
« no previous file with comments | « AUTHORS ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "tools/android/forwarder2/socket.h" 5 #include "tools/android/forwarder2/socket.h"
6 6
7 #include <arpa/inet.h> 7 #include <arpa/inet.h>
8 #include <fcntl.h> 8 #include <fcntl.h>
9 #include <netdb.h> 9 #include <netdb.h>
10 #include <netinet/in.h> 10 #include <netinet/in.h>
11 #include <stdio.h> 11 #include <stdio.h>
12 #include <string.h> 12 #include <string.h>
13 #include <sys/socket.h> 13 #include <sys/socket.h>
14 #include <sys/types.h> 14 #include <sys/types.h>
15 #include <unistd.h>
15 16
16 #include "base/logging.h" 17 #include "base/logging.h"
17 #include "base/posix/eintr_wrapper.h" 18 #include "base/posix/eintr_wrapper.h"
18 #include "base/safe_strerror_posix.h" 19 #include "base/safe_strerror_posix.h"
19 #include "tools/android/common/net.h" 20 #include "tools/android/common/net.h"
20 #include "tools/android/forwarder2/common.h" 21 #include "tools/android/forwarder2/common.h"
21 22
22 namespace { 23 namespace {
23 const int kNoTimeout = -1; 24 const int kNoTimeout = -1;
24 const int kConnectTimeOut = 10; // Seconds. 25 const int kConnectTimeOut = 10; // Seconds.
(...skipping 354 matching lines...) Expand 10 before | Expand all | Expand 10 after
379 return true; 380 return true;
380 } 381 }
381 382
382 // static 383 // static
383 int Socket::GetHighestFileDescriptor( 384 int Socket::GetHighestFileDescriptor(
384 const Socket& s1, const Socket& s2) { 385 const Socket& s1, const Socket& s2) {
385 return std::max(s1.socket_, s2.socket_); 386 return std::max(s1.socket_, s2.socket_);
386 } 387 }
387 388
388 } // namespace forwarder 389 } // namespace forwarder
OLDNEW
« no previous file with comments | « AUTHORS ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698