ui/gl/gl_bindings.h - Issue 1939683002: Test X11 header pollution

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 1939683002: Test X11 header pollution (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 8 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/gl/gl_bindings.h

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

index c973bed4caf3abffd525f153095234489a0e1bcd..d45b743a51c0c7376cf66597b5b0eff0056cacfc 100644

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

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

@@ -10,6 +10,14 @@

// the X11 headers on linux, which define all kinds of macros that are

// liable to cause conflicts.

+// GL headers may include inttypes.h and so we need to ensure that

+// __STDC_FORMAT_MACROS is defined in order for //base/format_macros.h to

+// function correctly. See comment and #error message in //base/format_macros.h

+// for details.

+#if defined(OS_POSIX) && !defined(__STDC_FORMAT_MACROS)

+#define __STDC_FORMAT_MACROS

+#endif

#include <GL/gl.h>

#include <GL/glext.h>

#include <EGL/egl.h>

« no previous file with comments | « media/media_gpu.gypi ('k') | no next file » | no next file with comments »