diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-07 22:30:34 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-07 22:30:34 +0000 |
| commit | e87dc91f3cac0ed09478441d1bedd69cde13457e (patch) | |
| tree | c08975dcec3c3b69824947b21cf6013b87c9dc64 /app/gfx | |
| parent | f14d336d8b8cc0142e6264512f2dcb1774b65590 (diff) | |
| download | chromium_src-e87dc91f3cac0ed09478441d1bedd69cde13457e.zip chromium_src-e87dc91f3cac0ed09478441d1bedd69cde13457e.tar.gz chromium_src-e87dc91f3cac0ed09478441d1bedd69cde13457e.tar.bz2 | |
linux: fix gl_context_egl header order
Chrome style is matching header first, then Chrome headers.
We only need one reordering tweak to make this file compile.
BUG=72233
Review URL: http://codereview.chromium.org/6312197
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74037 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app/gfx')
| -rw-r--r-- | app/gfx/gl/gl_context_egl.cc | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/app/gfx/gl/gl_context_egl.cc b/app/gfx/gl/gl_context_egl.cc index 8a5fb68..a367cd8 100644 --- a/app/gfx/gl/gl_context_egl.cc +++ b/app/gfx/gl/gl_context_egl.cc @@ -2,7 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include <EGL/egl.h> +#include "app/gfx/gl/gl_context_egl.h" + +#include "build/build_config.h" +#include "base/logging.h" +#include "base/scoped_ptr.h" +#include "third_party/angle/include/EGL/egl.h" + +// This header must come after the above third-party include, as +// it brings in #defines that cause conflicts. +#include "app/gfx/gl/gl_bindings.h" #if defined(OS_LINUX) extern "C" { @@ -11,12 +20,6 @@ extern "C" { #define EGL_HAS_PBUFFERS 1 #endif -#include "build/build_config.h" -#include "base/logging.h" -#include "base/scoped_ptr.h" -#include "app/gfx/gl/gl_bindings.h" -#include "app/gfx/gl/gl_context_egl.h" - namespace gfx { namespace { |