diff options
Diffstat (limited to 'net/socket')
| -rw-r--r-- | net/socket/ssl_client_socket_nss.cc | 4 | ||||
| -rw-r--r-- | net/socket/ssl_client_socket_nss.h | 4 | ||||
| -rw-r--r-- | net/socket/ssl_test_util.cc | 4 |
3 files changed, 0 insertions, 12 deletions
diff --git a/net/socket/ssl_client_socket_nss.cc b/net/socket/ssl_client_socket_nss.cc index f6cd614..19832ad 100644 --- a/net/socket/ssl_client_socket_nss.cc +++ b/net/socket/ssl_client_socket_nss.cc @@ -52,13 +52,9 @@ #include <nspr.h> #include <nss.h> #include <secerr.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 <ssl.h> #include <sslerr.h> #include <pk11pub.h> -#undef Lock #include "base/compiler_specific.h" #include "base/logging.h" diff --git a/net/socket/ssl_client_socket_nss.h b/net/socket/ssl_client_socket_nss.h index 6e871b5..73e6c8c 100644 --- a/net/socket/ssl_client_socket_nss.h +++ b/net/socket/ssl_client_socket_nss.h @@ -5,11 +5,7 @@ #ifndef NET_SOCKET_SSL_CLIENT_SOCKET_NSS_H_ #define NET_SOCKET_SSL_CLIENT_SOCKET_NSS_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 <certt.h> -#undef Lock #include <keyt.h> #include <nspr.h> #include <nss.h> diff --git a/net/socket/ssl_test_util.cc b/net/socket/ssl_test_util.cc index a58863e..d00b89d 100644 --- a/net/socket/ssl_test_util.cc +++ b/net/socket/ssl_test_util.cc @@ -16,13 +16,9 @@ #include <nspr.h> #include <nss.h> #include <secerr.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 <ssl.h> #include <sslerr.h> #include <pk11pub.h> -#undef Lock #include "base/nss_init.h" #elif defined(OS_MACOSX) #include <Security/Security.h> |