Index: webrtc/base/nssstreamadapter.h |
diff --git a/webrtc/base/nssstreamadapter.h b/webrtc/base/nssstreamadapter.h |
index 04c310ecb83f287e2605a31dc7ef73b635704dd2..4eb220be4ca9cbbda58eaf43c89c14baae54971a 100644 |
--- a/webrtc/base/nssstreamadapter.h |
+++ b/webrtc/base/nssstreamadapter.h |
@@ -14,13 +14,14 @@ |
#include <string> |
#include <vector> |
-// Hack: Define+undefine int64 and uint64 to avoid typedef conflict with NSS. |
+// Hack: Define+undefine int64_t and uint64_t to avoid typedef conflict with |
+// NSS. |
// TODO(kjellander): Remove when webrtc:4497 is completed. |
-#define uint64 foo_uint64 |
-#define int64 foo_int64 |
+#define uint64_t foo_uint64 |
+#define int64_t foo_int64 |
#include "nspr.h" |
-#undef uint64 |
-#undef int64 |
+#undef uint64_t |
+#undef int64_t |
#include "nss.h" |
#include "secmodt.h" |
@@ -77,10 +78,10 @@ class NSSStreamAdapter : public SSLStreamAdapterHelper { |
// Key Extractor interface |
bool ExportKeyingMaterial(const std::string& label, |
- const uint8* context, |
+ const uint8_t* context, |
size_t context_len, |
bool use_context, |
- uint8* result, |
+ uint8_t* result, |
size_t result_len) override; |
// DTLS-SRTP interface |