| Index: crypto/nss_util.h
|
| diff --git a/crypto/nss_util.h b/crypto/nss_util.h
|
| index 56fdfa6b659084fe77e36e98c18b14075afea3b9..1ca0de3e77759d40c4082f5f4aac3d61c388648c 100644
|
| --- a/crypto/nss_util.h
|
| +++ b/crypto/nss_util.h
|
| @@ -22,7 +22,7 @@ class Time;
|
| // initialization functions.
|
| namespace crypto {
|
|
|
| -#if defined(USE_NSS)
|
| +#if defined(USE_NSS_CERTS)
|
| // EarlySetupForNSSInit performs lightweight setup which must occur before the
|
| // process goes multithreaded. This does not initialise NSS. For test, see
|
| // EnsureNSSInit.
|
| @@ -127,7 +127,7 @@ CRYPTO_EXPORT base::Time PRTimeToBaseTime(int64 prtime);
|
| // We use a int64 instead of PRTime here to avoid depending on NSPR headers.
|
| CRYPTO_EXPORT int64 BaseTimeToPRTime(base::Time time);
|
|
|
| -#if defined(USE_NSS)
|
| +#if defined(USE_NSS_CERTS)
|
| // NSS has a bug which can cause a deadlock or stall in some cases when writing
|
| // to the certDB and keyDB. It also has a bug which causes concurrent key pair
|
| // generations to scribble over each other. To work around this, we synchronize
|
| @@ -148,7 +148,7 @@ class CRYPTO_EXPORT AutoNSSWriteLock {
|
| base::Lock *lock_;
|
| DISALLOW_COPY_AND_ASSIGN(AutoNSSWriteLock);
|
| };
|
| -#endif // defined(USE_NSS)
|
| +#endif // defined(USE_NSS_CERTS)
|
|
|
| } // namespace crypto
|
|
|
|
|