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

Side by Side Diff: webrtc/rtc_base/macifaddrs_converter.cc

Issue 2962303003: Revert "Update includes for webrtc/{base => rtc_base} rename (3/3)" (Closed)
Patch Set: Created 3 years, 5 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/rtc_base/logsinks.cc ('k') | webrtc/rtc_base/macutils.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 2015 The WebRTC Project Authors. All rights reserved. 2 * Copyright 2015 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 #include <memory> 11 #include <memory>
12 12
13 #include <net/if.h> 13 #include <net/if.h>
14 #include <sys/ioctl.h> 14 #include <sys/ioctl.h>
15 #include <unistd.h> 15 #include <unistd.h>
16 16
17 #include "webrtc/rtc_base/checks.h" 17 #include "webrtc/base/checks.h"
18 #include "webrtc/rtc_base/ifaddrs_converter.h" 18 #include "webrtc/base/ifaddrs_converter.h"
19 #include "webrtc/rtc_base/logging.h" 19 #include "webrtc/base/logging.h"
20 20
21 #if !defined(WEBRTC_IOS) 21 #if !defined(WEBRTC_IOS)
22 #include <net/if_media.h> 22 #include <net/if_media.h>
23 #include <netinet/in_var.h> 23 #include <netinet/in_var.h>
24 #else // WEBRTC_IOS 24 #else // WEBRTC_IOS
25 #define SCOPE6_ID_MAX 16 25 #define SCOPE6_ID_MAX 16
26 26
27 struct in6_addrlifetime { 27 struct in6_addrlifetime {
28 time_t ia6t_expire; /* valid lifetime expiration time */ 28 time_t ia6t_expire; /* valid lifetime expiration time */
29 time_t ia6t_preferred; /* preferred lifetime expiration time */ 29 time_t ia6t_preferred; /* preferred lifetime expiration time */
(...skipping 243 matching lines...) Expand 10 before | Expand all | Expand 10 after
273 std::unique_ptr<IPv6AttributesGetter> ip_attribute_getter_; 273 std::unique_ptr<IPv6AttributesGetter> ip_attribute_getter_;
274 }; 274 };
275 275
276 } // namespace 276 } // namespace
277 277
278 IfAddrsConverter* CreateIfAddrsConverter() { 278 IfAddrsConverter* CreateIfAddrsConverter() {
279 return new MacIfAddrsConverter(); 279 return new MacIfAddrsConverter();
280 } 280 }
281 281
282 } // namespace rtc 282 } // namespace rtc
OLDNEW
« no previous file with comments | « webrtc/rtc_base/logsinks.cc ('k') | webrtc/rtc_base/macutils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698