Commit 1622b557 authored by Oscar Johansson's avatar Oscar Johansson Committed by Commit Bot

Resolve LogSeverity macro/typedef conflict (browser/extensions)

LogSeverity is a typedef in base/logging.h and a macro
in the Windows header setupapi.h. When building using jumbo
this causes a conflict.

This commit solves the issue by undefining LogSeverity after importing
setupapi.h.

Bug: 850484,856964
Change-Id: I3e56c1a06357d8e03dbc98e01e51b18ae05e94dc
Reviewed-on: https://chromium-review.googlesource.com/1116790Reviewed-by: default avatarKen Rockot <rockot@chromium.org>
Commit-Queue: Oscar Johansson <oscarj@opera.com>
Cr-Commit-Position: refs/heads/master@{#571436}
parent 0df94b84
......@@ -7,6 +7,10 @@
#include <windows.h>
#include <setupapi.h>
// LogSeverity is both a macro in setupapi.h and a typedef in base/logging.h
#undef LogSeverity
#include <winioctl.h>
#include <memory>
......
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