diff options
Diffstat (limited to 'base')
| -rw-r--r-- | base/crypto/rsa_private_key_nss.cc | 4 | ||||
| -rw-r--r-- | base/crypto/signature_creator_nss.cc | 4 | ||||
| -rw-r--r-- | base/nss_init.cc | 5 |
3 files changed, 0 insertions, 13 deletions
diff --git a/base/crypto/rsa_private_key_nss.cc b/base/crypto/rsa_private_key_nss.cc index e48a195..7e10b36 100644 --- a/base/crypto/rsa_private_key_nss.cc +++ b/base/crypto/rsa_private_key_nss.cc @@ -4,13 +4,9 @@ #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> diff --git a/base/crypto/signature_creator_nss.cc b/base/crypto/signature_creator_nss.cc index 3ca4ff7..e0de4b7 100644 --- a/base/crypto/signature_creator_nss.cc +++ b/base/crypto/signature_creator_nss.cc @@ -4,13 +4,9 @@ #include "base/crypto/signature_creator.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 <stdlib.h> -#undef Lock #include "base/logging.h" #include "base/nss_init.h" diff --git a/base/nss_init.cc b/base/nss_init.cc index 015adae..7f65504 100644 --- a/base/nss_init.cc +++ b/base/nss_init.cc @@ -9,14 +9,9 @@ #include <plarena.h> #include <prerror.h> #include <prinit.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 <pk11pub.h> #include <secmod.h> #include <ssl.h> -#undef Lock #include "base/file_util.h" #include "base/logging.h" |