ui/gfx/gl/gl_bindings.h - Issue 8052015: Revert 102978 - Change X11 error handler override to allow easy X11 error checking.

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_bindings.h

Issue 8052015: Revert 102978 - Change X11 error handler override to allow easy X11 error checking. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 9 years, 3 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/gfx/gl/gl_bindings.h

===================================================================

--- ui/gfx/gl/gl_bindings.h (revision 102984)

+++ ui/gfx/gl/gl_bindings.h (working copy)

@@ -26,6 +26,12 @@

#elif defined(USE_X11)

#include <GL/glx.h>

#include <GL/glxext.h>

+// 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

#if defined(OS_WIN)

« no previous file with comments | « ui/base/x/x11_util_internal.h ('k') | ui/gfx/gl/gl_context_glx.cc » ('j') | no next file with comments »