OLD | NEW |
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_NSSIDENTITY_H_ | 11 #ifndef WEBRTC_BASE_NSSIDENTITY_H_ |
12 #define WEBRTC_BASE_NSSIDENTITY_H_ | 12 #define WEBRTC_BASE_NSSIDENTITY_H_ |
13 | 13 |
14 #include <string> | 14 #include <string> |
15 | 15 |
| 16 // Hack: Define+undefine int64 and uint64 to avoid typedef conflict with NSS. |
| 17 // TODO(kjellander): Remove when webrtc:4497 is completed. |
| 18 #define uint64 foo_uint64 |
| 19 #define int64 foo_int64 |
16 #include "cert.h" | 20 #include "cert.h" |
| 21 #undef uint64 |
| 22 #undef int64 |
17 #include "nspr.h" | 23 #include "nspr.h" |
18 #include "hasht.h" | 24 #include "hasht.h" |
19 #include "keythi.h" | 25 #include "keythi.h" |
20 | 26 |
21 #include "webrtc/base/common.h" | 27 #include "webrtc/base/common.h" |
22 #include "webrtc/base/logging.h" | 28 #include "webrtc/base/logging.h" |
23 #include "webrtc/base/scoped_ptr.h" | 29 #include "webrtc/base/scoped_ptr.h" |
24 #include "webrtc/base/sslidentity.h" | 30 #include "webrtc/base/sslidentity.h" |
25 | 31 |
26 namespace rtc { | 32 namespace rtc { |
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
115 | 121 |
116 rtc::scoped_ptr<NSSKeyPair> keypair_; | 122 rtc::scoped_ptr<NSSKeyPair> keypair_; |
117 rtc::scoped_ptr<NSSCertificate> certificate_; | 123 rtc::scoped_ptr<NSSCertificate> certificate_; |
118 | 124 |
119 DISALLOW_COPY_AND_ASSIGN(NSSIdentity); | 125 DISALLOW_COPY_AND_ASSIGN(NSSIdentity); |
120 }; | 126 }; |
121 | 127 |
122 } // namespace rtc | 128 } // namespace rtc |
123 | 129 |
124 #endif // WEBRTC_BASE_NSSIDENTITY_H_ | 130 #endif // WEBRTC_BASE_NSSIDENTITY_H_ |
OLD | NEW |