ui/gfx/gl/gl_context_egl.cc - Issue 6990051: Unix ifdefs patch for ui/ and webkit/

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: ui/gfx/gl/gl_context_egl.cc

Issue 6990051: Unix ifdefs patch for ui/ and webkit/ (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk

Patch Set: removed some too general ifdefs and ppapi changes Created 9 years, 7 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:

Index: ui/gfx/gl/gl_context_egl.cc

diff --git a/ui/gfx/gl/gl_context_egl.cc b/ui/gfx/gl/gl_context_egl.cc

index d15dd170cb750c11e7c83d10ad51457c6656c223..14701c09ee4472005b5fbc8146a40f23c4d1a99f 100644

--- a/ui/gfx/gl/gl_context_egl.cc

+++ b/ui/gfx/gl/gl_context_egl.cc

@@ -15,7 +15,7 @@

// it brings in #defines that cause conflicts.

#include "ui/gfx/gl/gl_bindings.h"

-#if defined(OS_LINUX)

+#if defined(USE_X11)

extern "C" {

#include <X11/Xlib.h>

}