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

Side by Side Diff: webrtc/base/proxydetect.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/proxydetect.h ('k') | webrtc/base/ssladapter.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 #include "webrtc/base/proxydetect.h" 11 #include "webrtc/base/proxydetect.h"
12 12
13 #if defined(WEBRTC_WIN) 13 #if defined(WEBRTC_WIN)
14 #include "webrtc/base/win32.h" 14 #include "webrtc/base/win32.h"
15 #include <shlobj.h> 15 #include <shlobj.h>
16 #endif // WEBRTC_WIN 16 #endif // WEBRTC_WIN
17 17
18 #ifdef HAVE_CONFIG_H
19 #include "config.h"
20 #endif
21
22 #if defined(WEBRTC_MAC) && !defined(WEBRTC_IOS) 18 #if defined(WEBRTC_MAC) && !defined(WEBRTC_IOS)
23 #include <SystemConfiguration/SystemConfiguration.h> 19 #include <SystemConfiguration/SystemConfiguration.h>
24 #include <CoreFoundation/CoreFoundation.h> 20 #include <CoreFoundation/CoreFoundation.h>
25 #include <CoreServices/CoreServices.h> 21 #include <CoreServices/CoreServices.h>
26 #include <Security/Security.h> 22 #include <Security/Security.h>
27 #include "macconversion.h" 23 #include "macconversion.h"
28 #endif 24 #endif
29 25
30 #ifdef WEBRTC_IOS 26 #ifdef WEBRTC_IOS
31 #include <CFNetwork/CFNetwork.h> 27 #include <CFNetwork/CFNetwork.h>
(...skipping 1263 matching lines...) Expand 10 before | Expand all | Expand 10 after
1295 if (!result) { 1291 if (!result) {
1296 // Either auto detection is not supported or we simply didn't 1292 // Either auto detection is not supported or we simply didn't
1297 // find any proxy, reset type. 1293 // find any proxy, reset type.
1298 proxy->type = rtc::PROXY_NONE; 1294 proxy->type = rtc::PROXY_NONE;
1299 } 1295 }
1300 } 1296 }
1301 return result; 1297 return result;
1302 } 1298 }
1303 1299
1304 } // namespace rtc 1300 } // namespace rtc
OLDNEW
« no previous file with comments | « webrtc/base/proxydetect.h ('k') | webrtc/base/ssladapter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698