summaryrefslogtreecommitdiffstats
path: root/gpu
diff options
context:
space:
mode:
authoralokp@chromium.org <alokp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-21 15:39:15 +0000
committeralokp@chromium.org <alokp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-21 15:39:15 +0000
commit16a20c48086fd0616f8b2e2c30386b92f662a819 (patch)
treeb33bd8756b6b79e202e311e948fe23ae3411ac69 /gpu
parent5587489cf4688fccbf21b8cbe7593b8ea6448b11 (diff)
downloadchromium_src-16a20c48086fd0616f8b2e2c30386b92f662a819.zip
chromium_src-16a20c48086fd0616f8b2e2c30386b92f662a819.tar.gz
chromium_src-16a20c48086fd0616f8b2e2c30386b92f662a819.tar.bz2
Changed NPAPI include path to be absolute. Since we cannot use ANY npapi header, keeping the include path as absolute is less confusing.
Review URL: http://codereview.chromium.org/1722001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45193 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
-rw-r--r--gpu/gpu.gyp4
-rw-r--r--gpu/pgl/pgl.cc4
-rw-r--r--gpu/pgl/pgl.h4
3 files changed, 4 insertions, 8 deletions
diff --git a/gpu/gpu.gyp b/gpu/gpu.gyp
index 5110762..ff3391e 100644
--- a/gpu/gpu.gyp
+++ b/gpu/gpu.gyp
@@ -413,10 +413,6 @@
'gles2_c_lib',
'../third_party/npapi/npapi.gyp:npapi',
],
- 'include_dirs': [
- '..',
- '../third_party/npapi/bindings',
- ],
'all_dependent_settings': {
'include_dirs': [
'../third_party/npapi/bindings',
diff --git a/gpu/pgl/pgl.cc b/gpu/pgl/pgl.cc
index cf32e6a..3e42854 100644
--- a/gpu/pgl/pgl.cc
+++ b/gpu/pgl/pgl.cc
@@ -2,15 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include <build/build_config.h>
+#include "gpu/pgl/pgl.h"
+#include "build/build_config.h"
#include "gpu/command_buffer/client/gles2_cmd_helper.h"
#include "gpu/command_buffer/client/gles2_implementation.h"
#include "gpu/command_buffer/client/gles2_lib.h"
#include "gpu/command_buffer/common/constants.h"
#include "gpu/command_buffer/common/thread_local.h"
#include "gpu/pgl/command_buffer_pepper.h"
-#include "gpu/pgl/pgl.h"
namespace {
const int32 kTransferBufferSize = 512 * 1024;
diff --git a/gpu/pgl/pgl.h b/gpu/pgl/pgl.h
index 118d6fe..e413587 100644
--- a/gpu/pgl/pgl.h
+++ b/gpu/pgl/pgl.h
@@ -5,8 +5,8 @@
#ifndef GPU_PGL_PGL_H
#define GPU_PGL_PGL_H
-#include "npapi.h"
-#include "npapi_extensions.h"
+#include <npapi.h>
+#include <npapi_extensions.h>
#define PGL_TRUE 1
#define PGL_FALSE 0