Commit a9ccc2a8 authored by Daniel Bratell's avatar Daniel Bratell Committed by Commit Bot

[jumbo] X11/gfx: Need to say ::Display or it's ambiguous.

There are several classes/types named Display so to get
the X11 one, you have to specify it with ::Display (gfx::Display
is a common alternative when you're inside the gfx namespace).

TBR=hubbe@google.com

Bug: 822068
Change-Id: I402b7ad2d37a82d3091577733f3f06e673c29c7e
Reviewed-on: https://chromium-review.googlesource.com/994212
Commit-Queue: Daniel Bratell <bratell@opera.com>
Reviewed-by: default avatarFredrik Hubinette <hubbe@chromium.org>
Reviewed-by: default avatarDaniel Bratell <bratell@opera.com>
Cr-Commit-Position: refs/heads/master@{#547916}
parent d37c909e
...@@ -330,7 +330,7 @@ std::vector<display::Display> DesktopScreenX11::BuildDisplaysFromXRandRInfo() { ...@@ -330,7 +330,7 @@ std::vector<display::Display> DesktopScreenX11::BuildDisplaysFromXRandRInfo() {
if (xrandr_version_ >= 105) { if (xrandr_version_ >= 105) {
void* xrandr_lib = dlopen(NULL, RTLD_NOW); void* xrandr_lib = dlopen(NULL, RTLD_NOW);
if (xrandr_lib) { if (xrandr_lib) {
typedef XRRMonitorInfo* (*XRRGetMonitors_type)(Display*, Window, bool, typedef XRRMonitorInfo* (*XRRGetMonitors_type)(::Display*, Window, bool,
int*); int*);
typedef void (*XRRFreeMonitors_type)(XRRMonitorInfo*); typedef void (*XRRFreeMonitors_type)(XRRMonitorInfo*);
XRRGetMonitors_type XRRGetMonitors_ptr = XRRGetMonitors_type XRRGetMonitors_ptr =
......
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