diff options
| author | davidben <davidben@chromium.org> | 2015-08-11 16:41:54 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-08-11 23:42:23 +0000 |
| commit | 591b117f69bab18f9dc8ade07dfa0e30d7c1e00f (patch) | |
| tree | b5b78227dfcdc588ccd3304375249a21f5e87641 /crypto | |
| parent | 83b2aa790bfd6c468bc9fe094d1d49db91fe01e0 (diff) | |
| download | chromium_src-591b117f69bab18f9dc8ade07dfa0e30d7c1e00f.zip chromium_src-591b117f69bab18f9dc8ade07dfa0e30d7c1e00f.tar.gz chromium_src-591b117f69bab18f9dc8ade07dfa0e30d7c1e00f.tar.bz2 | |
Fix up #ifdefs in crypto/encryptor.h.
This was causing scoped_nss_types.h to be incorrectly included in the chimera
build. (No actual consequence. The header is legal in the chimera, it's just
unnecessary.)
BUG=none
Review URL: https://codereview.chromium.org/1281033003
Cr-Commit-Position: refs/heads/master@{#342938}
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/encryptor.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/crypto/encryptor.h b/crypto/encryptor.h index 8052a9f..85ebaeb 100644 --- a/crypto/encryptor.h +++ b/crypto/encryptor.h @@ -13,8 +13,7 @@ #include "build/build_config.h" #include "crypto/crypto_export.h" -#if defined(USE_NSS_CERTS) || \ - (!defined(USE_OPENSSL) && (defined(OS_WIN) || defined(OS_MACOSX))) +#if !defined(USE_OPENSSL) #include "crypto/scoped_nss_types.h" #endif @@ -122,7 +121,7 @@ class CRYPTO_EXPORT Encryptor { const base::StringPiece& input, std::string* output); std::string iv_; -#elif defined(USE_NSS_CERTS) || defined(OS_WIN) || defined(OS_MACOSX) +#else bool Crypt(PK11Context* context, const base::StringPiece& input, std::string* output); |