Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(955)

Unified Diff: crypto/encryptor.h

Issue 1281033003: Fix up #ifdefs in crypto/encryptor.h. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: crypto/encryptor.h
diff --git a/crypto/encryptor.h b/crypto/encryptor.h
index 8052a9fd5744f8293c1e842d9ace05eff6e46dc4..85ebaeb14993d9ab86eb01f619b4a43843db17dd 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);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698