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

Side by Side Diff: webrtc/base/network.cc

Issue 1820023004: Remove all uses of the HAVE_CONFIG_H define. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebased Created 4 years, 8 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 | « webrtc/base/logging.h ('k') | webrtc/base/openssladapter.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2004 The WebRTC Project Authors. All rights reserved. 2 * Copyright 2004 The WebRTC Project Authors. All rights reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #ifdef HAVE_CONFIG_H
12 #include "config.h"
13 #endif
14
15 #include "webrtc/base/network.h" 11 #include "webrtc/base/network.h"
16 12
17 #if defined(WEBRTC_POSIX) 13 #if defined(WEBRTC_POSIX)
18 // linux/if.h can't be included at the same time as the posix sys/if.h, and 14 // linux/if.h can't be included at the same time as the posix sys/if.h, and
19 // it's transitively required by linux/route.h, so include that version on 15 // it's transitively required by linux/route.h, so include that version on
20 // linux instead of the standard posix one. 16 // linux instead of the standard posix one.
21 #if defined(WEBRTC_LINUX) 17 #if defined(WEBRTC_LINUX)
22 #include <linux/if.h> 18 #include <linux/if.h>
23 #include <linux/route.h> 19 #include <linux/route.h>
24 #elif !defined(__native_client__) 20 #elif !defined(__native_client__)
(...skipping 895 matching lines...) Expand 10 before | Expand all | Expand 10 after
920 std::stringstream ss; 916 std::stringstream ss;
921 // Print out the first space-terminated token of the network desc, plus 917 // Print out the first space-terminated token of the network desc, plus
922 // the IP address. 918 // the IP address.
923 ss << "Net[" << description_.substr(0, description_.find(' ')) 919 ss << "Net[" << description_.substr(0, description_.find(' '))
924 << ":" << prefix_.ToSensitiveString() << "/" << prefix_length_ 920 << ":" << prefix_.ToSensitiveString() << "/" << prefix_length_
925 << ":" << AdapterTypeToString(type_) << "]"; 921 << ":" << AdapterTypeToString(type_) << "]";
926 return ss.str(); 922 return ss.str();
927 } 923 }
928 924
929 } // namespace rtc 925 } // namespace rtc
OLDNEW
« no previous file with comments | « webrtc/base/logging.h ('k') | webrtc/base/openssladapter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698