ui/gl/gl_bindings.h - Issue 1936093003: Fix gpu_video_decode_accelerator include order by renaming enum with X11 name collision

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/gl/gl_bindings.h

Issue 1936093003: Fix gpu_video_decode_accelerator include order by renaming enum with X11 name collision (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Move misplaced #endif to preserve #undefs across platforms Created 4 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:

View side-by-side diff with in-line comments

Download patch

Index: ui/gl/gl_bindings.h

diff --git a/ui/gl/gl_bindings.h b/ui/gl/gl_bindings.h

index d45b743a51c0c7376cf66597b5b0eff0056cacfc..ee1e466976687c8d72e2acc5497c25115d9ea3e4 100644

--- a/ui/gl/gl_bindings.h

+++ b/ui/gl/gl_bindings.h

@@ -39,13 +39,13 @@

#elif defined(USE_GLX)

#include <GL/glx.h>

#include <GL/glxext.h>

+#endif

// Undefine some macros defined by X headers. This is why this file should only

// be included in .cc files.

#undef Bool

#undef None

#undef Status

-#endif

// GLES2 defines not part of Desktop GL

« no previous file with comments | « media/gpu/ipc/service/gpu_video_decode_accelerator.cc ('k') | no next file » | no next file with comments »