Index: base/crypto/rsa_private_key_nss.cc |
diff --git a/base/crypto/rsa_private_key_nss.cc b/base/crypto/rsa_private_key_nss.cc |
index 7e10b364d0a75a9b80d84643600e73c9209568d8..e48a1956f9b0fd81f54aa14e9ae9e5e33c9900fb 100644 |
--- a/base/crypto/rsa_private_key_nss.cc |
+++ b/base/crypto/rsa_private_key_nss.cc |
@@ -4,9 +4,13 @@ |
#include "base/crypto/rsa_private_key.h" |
+// Work around https://bugzilla.mozilla.org/show_bug.cgi?id=455424 |
+// until NSS 3.12.2 comes out and we update to it. |
+#define Lock FOO_NSS_Lock |
#include <cryptohi.h> |
#include <keyhi.h> |
#include <pk11pub.h> |
+#undef Lock |
#include <iostream> |
#include <list> |