Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(332)

Side by Side 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, 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 unified diff | Download patch
« no previous file with comments | « media/media_gpu.gypi ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef UI_GL_GL_BINDINGS_H_ 5 #ifndef UI_GL_GL_BINDINGS_H_
6 #define UI_GL_GL_BINDINGS_H_ 6 #define UI_GL_GL_BINDINGS_H_
7 7
8 // Includes the platform independent and platform dependent GL headers. 8 // Includes the platform independent and platform dependent GL headers.
9 // Only include this in cc files. It pulls in system headers, including 9 // Only include this in cc files. It pulls in system headers, including
10 // the X11 headers on linux, which define all kinds of macros that are 10 // the X11 headers on linux, which define all kinds of macros that are
11 // liable to cause conflicts. 11 // liable to cause conflicts.
12 12
13 // GL headers may include inttypes.h and so we need to ensure that
14 // __STDC_FORMAT_MACROS is defined in order for //base/format_macros.h to
15 // function correctly. See comment and #error message in //base/format_macros.h
16 // for details.
17 #if defined(OS_POSIX) && !defined(__STDC_FORMAT_MACROS)
18 #define __STDC_FORMAT_MACROS
19 #endif
20
13 #include <GL/gl.h> 21 #include <GL/gl.h>
14 #include <GL/glext.h> 22 #include <GL/glext.h>
15 #include <EGL/egl.h> 23 #include <EGL/egl.h>
16 #include <EGL/eglext.h> 24 #include <EGL/eglext.h>
17 #include <stdint.h> 25 #include <stdint.h>
18 26
19 #include <string> 27 #include <string>
20 28
21 #include "base/logging.h" 29 #include "base/logging.h"
22 #include "base/threading/thread_local.h" 30 #include "base/threading/thread_local.h"
(...skipping 464 matching lines...) Expand 10 before | Expand all | Expand 10 after
487 #endif 495 #endif
488 496
489 #if defined(USE_GLX) 497 #if defined(USE_GLX)
490 GL_EXPORT extern GLXApi* g_current_glx_context; 498 GL_EXPORT extern GLXApi* g_current_glx_context;
491 GL_EXPORT extern DriverGLX g_driver_glx; 499 GL_EXPORT extern DriverGLX g_driver_glx;
492 #endif 500 #endif
493 501
494 } // namespace gfx 502 } // namespace gfx
495 503
496 #endif // UI_GL_GL_BINDINGS_H_ 504 #endif // UI_GL_GL_BINDINGS_H_
OLDNEW
« no previous file with comments | « media/media_gpu.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698