diff options
| author | evanm@google.com <evanm@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-24 05:25:22 +0000 |
|---|---|---|
| committer | evanm@google.com <evanm@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-24 05:25:22 +0000 |
| commit | 8943d1c09b155984790847a849e816ffe695a91a (patch) | |
| tree | 2f15e97a719c40b3913985a746528012cfc43484 /webkit/tools/npapi_layout_test_plugin/main.cpp | |
| parent | a2f2ece0cad9e554a7c1d547658f707642192d4b (diff) | |
| download | chromium_src-8943d1c09b155984790847a849e816ffe695a91a.zip chromium_src-8943d1c09b155984790847a849e816ffe695a91a.tar.gz chromium_src-8943d1c09b155984790847a849e816ffe695a91a.tar.bz2 | |
Temporarily disable any use of Xlib in our code until we get the X development
libs on the buildbots.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2544 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/npapi_layout_test_plugin/main.cpp')
| -rw-r--r-- | webkit/tools/npapi_layout_test_plugin/main.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/webkit/tools/npapi_layout_test_plugin/main.cpp b/webkit/tools/npapi_layout_test_plugin/main.cpp index b7cf5b0..3feaa1d 100644 --- a/webkit/tools/npapi_layout_test_plugin/main.cpp +++ b/webkit/tools/npapi_layout_test_plugin/main.cpp @@ -34,9 +34,13 @@ #include <stdlib.h> #include <stdio.h> #include <wtf/Platform.h> +// The buildbot doesn't have Xlib. Rather than revert this, I've just +// temporarily ifdef'd it out. +#ifdef XLIB_TEMPORARILY_DISABLED #if PLATFORM(UNIX) #include <X11/Xlib.h> #endif +#endif #include "PluginObject.h" #ifdef WIN32 @@ -258,6 +262,7 @@ int16 NPP_HandleEvent(NPP instance, void *event) fflush(stdout); #elif PLATFORM(UNIX) +#ifdef XLIB_TEMPORARILY_DISABLED XEvent* evt = static_cast<XEvent*>(event); XButtonPressedEvent* bpress_evt = reinterpret_cast<XButtonPressedEvent*>(evt); XButtonReleasedEvent* brelease_evt = reinterpret_cast<XButtonReleasedEvent*>(evt); @@ -296,6 +301,7 @@ int16 NPP_HandleEvent(NPP instance, void *event) } fflush(stdout); +#endif // XLIB_TEMPORARILY_DISABLED #else EventRecord* evt = static_cast<EventRecord*>(event); |