summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-16 20:58:21 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-16 20:58:21 +0000
commit2cb1ecb7aa5b6bf5c17cfaa75293121c8bd73130 (patch)
tree7a78c33c623753dfd4fd88c208fe3e0f52ecc63c /webkit
parentdff10201fea8dfa631a292739d921d5d0eb52704 (diff)
downloadchromium_src-2cb1ecb7aa5b6bf5c17cfaa75293121c8bd73130.zip
chromium_src-2cb1ecb7aa5b6bf5c17cfaa75293121c8bd73130.tar.gz
chromium_src-2cb1ecb7aa5b6bf5c17cfaa75293121c8bd73130.tar.bz2
linux: users of glue require GTK in the include path.
Review URL: http://codereview.chromium.org/79018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13876 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/glue/webcursor.h2
-rw-r--r--webkit/webkit.gyp4
2 files changed, 6 insertions, 0 deletions
diff --git a/webkit/glue/webcursor.h b/webkit/glue/webcursor.h
index f2fbe62..a411ebc 100644
--- a/webkit/glue/webcursor.h
+++ b/webkit/glue/webcursor.h
@@ -17,6 +17,8 @@ typedef struct HICON__* HICON;
typedef HICON HCURSOR;
#elif defined(TOOLKIT_GTK)
// GdkCursorType is an enum, which we can't forward-declare. :(
+// If you work around this, be sure to fix webkit.gyp:glue to not put
+// GTK in the export_dependent_settings section!
#include <gdk/gdkcursor.h>
#elif defined(OS_MACOSX)
#ifdef __OBJC__
diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp
index 24b23f6..fae18c9 100644
--- a/webkit/webkit.gyp
+++ b/webkit/webkit.gyp
@@ -4490,6 +4490,10 @@
'dependencies': [
'../build/linux/system.gyp:gtk',
],
+ 'export_dependent_settings': [
+ # Users of webcursor.h need the GTK include path.
+ '../build/linux/system.gyp:gtk',
+ ],
'sources!': [
'glue/plugins/plugin_stubs.cc',
],