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

Unified Diff: net/base/x509_cert_types.h

Issue 10834051: Bringing up the net target on iOS. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 5 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 | « net/base/platform_mime_util_mac.mm ('k') | net/net.gyp » ('j') | net/net.gyp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/base/x509_cert_types.h
diff --git a/net/base/x509_cert_types.h b/net/base/x509_cert_types.h
index bf13242285511898d1fbafb175d3fecca07e1758..cfde622087b2a25ce9344052c958e9c17245b135 100644
--- a/net/base/x509_cert_types.h
+++ b/net/base/x509_cert_types.h
@@ -15,7 +15,7 @@
#include "build/build_config.h"
#include "net/base/net_export.h"
-#if defined(OS_MACOSX)
+#if defined(OS_MACOSX) && !defined(OS_IOS)
#include <Security/x509defs.h>
#endif
@@ -63,7 +63,7 @@ struct NET_EXPORT CertPrincipal {
explicit CertPrincipal(const std::string& name);
~CertPrincipal();
-#if defined(OS_MACOSX) || defined(OS_WIN)
+#if (defined(OS_MACOSX) && !defined(OS_IOS)) || defined(OS_WIN)
// Parses a BER-format DistinguishedName.
bool ParseDistinguishedName(const void* ber_name_data, size_t length);
#endif
@@ -136,7 +136,7 @@ class NET_EXPORT CertPolicy {
std::set<SHA1Fingerprint, SHA1FingerprintLessThan> denied_;
};
-#if defined(OS_MACOSX)
+#if defined(OS_MACOSX) && !defined(OS_IOS)
// Compares two OIDs by value.
inline bool CSSMOIDEqual(const CSSM_OID* oid1, const CSSM_OID* oid2) {
return oid1->Length == oid2->Length &&
« no previous file with comments | « net/base/platform_mime_util_mac.mm ('k') | net/net.gyp » ('j') | net/net.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698