Commit 7d15d62e authored by Daniel Bratell's avatar Daniel Bratell Committed by Commit Bot

Resolve conflicts between Win32 headers and OpenSSL

Both some Win32 headers and OpenSSL/BoringSSL defines some
constant macros like X509_NAME. To avoid that clash we have
a wrapper for <wincrypt.h>, crypto/wincrypt_shim.h Use that
one in chrome/chrome_cleaner/os/system_util.h too since
that header might be used close to OpenSSL code.

Change-Id: I678b5aa1658e8436eed4b431e6c2950ce7acfb3b
Reviewed-on: https://chromium-review.googlesource.com/1255825Reviewed-by: default avatarJoe Mason <joenotcharles@chromium.org>
Commit-Queue: Daniel Bratell <bratell@opera.com>
Cr-Commit-Position: refs/heads/master@{#595820}
parent 92fdaae5
......@@ -7,10 +7,9 @@
#include <windows.h>
#include <wincrypt.h>
#include "base/strings/string16.h"
#include "base/win/scoped_handle.h"
#include "crypto/wincrypt_shim.h"
namespace chrome_cleaner {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment