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

Side by Side Diff: webrtc/libjingle/xmpp/xmppsocket.cc

Issue 1443273002: cleanup: get rid of basicdefs.h include (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years, 1 month 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/libjingle/xmpp/xmppclient.h ('k') | webrtc/p2p/base/transportdescription.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 "xmppsocket.h" 11 #include "xmppsocket.h"
12 12
13 #ifdef HAVE_CONFIG_H 13 #ifdef HAVE_CONFIG_H
14 #include <config.h> 14 #include <config.h>
15 #endif 15 #endif
16 16
17 #include <errno.h> 17 #include <errno.h>
18 #include "webrtc/base/basicdefs.h"
19 #include "webrtc/base/logging.h" 18 #include "webrtc/base/logging.h"
20 #include "webrtc/base/thread.h" 19 #include "webrtc/base/thread.h"
21 #ifdef FEATURE_ENABLE_SSL 20 #ifdef FEATURE_ENABLE_SSL
22 #include "webrtc/base/ssladapter.h" 21 #include "webrtc/base/ssladapter.h"
23 #endif 22 #endif
24 23
25 #ifdef USE_SSLSTREAM 24 #ifdef USE_SSLSTREAM
26 #include "webrtc/base/socketstream.h" 25 #include "webrtc/base/socketstream.h"
27 #ifdef FEATURE_ENABLE_SSL 26 #ifdef FEATURE_ENABLE_SSL
28 #include "webrtc/base/sslstreamadapter.h" 27 #include "webrtc/base/sslstreamadapter.h"
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
236 #endif // USE_SSLSTREAM 235 #endif // USE_SSLSTREAM
237 state_ = buzz::AsyncSocket::STATE_TLS_CONNECTING; 236 state_ = buzz::AsyncSocket::STATE_TLS_CONNECTING;
238 return true; 237 return true;
239 #else // !defined(FEATURE_ENABLE_SSL) 238 #else // !defined(FEATURE_ENABLE_SSL)
240 return false; 239 return false;
241 #endif // !defined(FEATURE_ENABLE_SSL) 240 #endif // !defined(FEATURE_ENABLE_SSL)
242 } 241 }
243 242
244 } // namespace buzz 243 } // namespace buzz
245 244
OLDNEW
« no previous file with comments | « webrtc/libjingle/xmpp/xmppclient.h ('k') | webrtc/p2p/base/transportdescription.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698