Index: webrtc/base/helpers.cc |
diff --git a/webrtc/base/helpers.cc b/webrtc/base/helpers.cc |
index 0102c10e7bafc73af0b29a301ea756b84332a535..e12ba107eac3e97b57e6364f97cf5a56d27e5e4c 100644 |
--- a/webrtc/base/helpers.cc |
+++ b/webrtc/base/helpers.cc |
@@ -16,6 +16,14 @@ |
#include "webrtc/base/sslconfig.h" |
#if defined(SSL_USE_OPENSSL) |
#include <openssl/rand.h> |
+#elif defined(SSL_USE_NSS_RNG) |
+// Hack: Define+undefine int64 and uint64 to avoid typedef conflict with NSS. |
+// TODO(kjellander): Remove when webrtc:4497 is completed. |
+#define uint64 foo_uint64 |
+#define int64 foo_int64 |
+#include "pk11func.h" |
+#undef uint64 |
+#undef int64 |
#else |
#if defined(WEBRTC_WIN) |
#define WIN32_LEAN_AND_MEAN |