net/cert/x509_certificate.h - Issue 686883002: Add crypto/wincrypt_shim.h wrapper header to resolve BoringSSL conflicts.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: net/cert/x509_certificate.h

Issue 686883002: Add crypto/wincrypt_shim.h wrapper header to resolve BoringSSL conflicts. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: sleevi comments Created 6 years, 2 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

Index: net/cert/x509_certificate.h

diff --git a/net/cert/x509_certificate.h b/net/cert/x509_certificate.h

index 008de71f13e31fb638ea452e83ed94aae139ea48..8d8e793710cd3449d422818f987b1c9f449923e9 100644

--- a/net/cert/x509_certificate.h

+++ b/net/cert/x509_certificate.h

@@ -20,11 +20,10 @@

#if defined(OS_WIN)

#include <windows.h>

-#include <wincrypt.h>

+#include "crypto/wincrypt_shim.h"

#elif defined(OS_MACOSX)

#include <CoreFoundation/CFArray.h>

#include <Security/SecBase.h>

#elif defined(USE_OPENSSL_CERTS)

// Forward declaration; real one in <x509.h>

typedef struct x509_st X509;

« no previous file with comments | « net/cert/x509_cert_types_win.cc ('k') | net/ssl/client_cert_store_win.cc » ('j') | no next file with comments »