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

Side by Side Diff: webrtc/base/nssstreamadapter.h

Issue 1186093004: Define uint64 and int64 using long long. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years, 6 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/nssidentity.h ('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 /* 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 #ifndef WEBRTC_BASE_NSSSTREAMADAPTER_H_ 11 #ifndef WEBRTC_BASE_NSSSTREAMADAPTER_H_
12 #define WEBRTC_BASE_NSSSTREAMADAPTER_H_ 12 #define WEBRTC_BASE_NSSSTREAMADAPTER_H_
13 13
14 #include <string> 14 #include <string>
15 #include <vector> 15 #include <vector>
16 16
17 // Hack: Define+undefine int64 and uint64 to avoid typedef conflict with NSS.
18 // TODO(kjellander): Remove when webrtc:4497 is completed.
19 #define uint64 foo_uint64
20 #define int64 foo_int64
17 #include "nspr.h" 21 #include "nspr.h"
22 #undef uint64
23 #undef int64
24
18 #include "nss.h" 25 #include "nss.h"
19 #include "secmodt.h" 26 #include "secmodt.h"
20 27
21 #include "webrtc/base/buffer.h" 28 #include "webrtc/base/buffer.h"
22 #include "webrtc/base/criticalsection.h" 29 #include "webrtc/base/criticalsection.h"
23 #include "webrtc/base/nssidentity.h" 30 #include "webrtc/base/nssidentity.h"
24 #include "webrtc/base/ssladapter.h" 31 #include "webrtc/base/ssladapter.h"
25 #include "webrtc/base/sslstreamadapter.h" 32 #include "webrtc/base/sslstreamadapter.h"
26 #include "webrtc/base/sslstreamadapterhelper.h" 33 #include "webrtc/base/sslstreamadapterhelper.h"
27 34
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 static bool initialized; // Was InitializeSSL() called? 115 static bool initialized; // Was InitializeSSL() called?
109 bool cert_ok_; // Did we get and check a cert 116 bool cert_ok_; // Did we get and check a cert
110 std::vector<PRUint16> srtp_ciphers_; // SRTP cipher list 117 std::vector<PRUint16> srtp_ciphers_; // SRTP cipher list
111 118
112 static PRDescIdentity nspr_layer_identity; // The NSPR layer identity 119 static PRDescIdentity nspr_layer_identity; // The NSPR layer identity
113 }; 120 };
114 121
115 } // namespace rtc 122 } // namespace rtc
116 123
117 #endif // WEBRTC_BASE_NSSSTREAMADAPTER_H_ 124 #endif // WEBRTC_BASE_NSSSTREAMADAPTER_H_
OLDNEW
« no previous file with comments | « webrtc/base/nssidentity.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698