From c6ac2609dd032e468440cd4f7f86770b4cb9774d Mon Sep 17 00:00:00 2001
From: davidben <davidben@chromium.org>
Date: Wed, 29 Oct 2014 17:39:38 -0700
Subject: Add crypto/wincrypt_shim.h wrapper header to resolve BoringSSL
 conflicts.

wincrypt.h defines macros that conflict with BoringSSL. Introduce a
crypto/wincrypt_shim.h wrapper header which #undefs those macros and
instead #defines replacement ones. All Chromium headers should
use this wrapper header.

BUG=338884

Review URL: https://codereview.chromium.org/686883002

Cr-Commit-Position: refs/heads/master@{#301994}
---
 net/cert/cert_database_win.cc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'net/cert/cert_database_win.cc')

diff --git a/net/cert/cert_database_win.cc b/net/cert/cert_database_win.cc
index 9bf378c..fae3cbf 100644
--- a/net/cert/cert_database_win.cc
+++ b/net/cert/cert_database_win.cc
@@ -5,13 +5,14 @@
 #include "net/cert/cert_database.h"
 
 #include <windows.h>
-#include <wincrypt.h>
-#pragma comment(lib, "crypt32.lib")
 
 #include "base/observer_list_threadsafe.h"
+#include "crypto/wincrypt_shim.h"
 #include "net/base/net_errors.h"
 #include "net/cert/x509_certificate.h"
 
+#pragma comment(lib, "crypt32.lib")
+
 namespace net {
 
 CertDatabase::CertDatabase()
-- 
cgit v1.1