diff options
| author | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-28 19:57:26 +0000 |
|---|---|---|
| committer | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-28 19:57:26 +0000 |
| commit | d90efd53258c1323a73c6326e2bbced20020b37d (patch) | |
| tree | d5d0ade04bf3046511cfba3bc2c9205d423d7b80 /base | |
| parent | 8260ba3e9b6f976a883da622ec652c6f7797b13e (diff) | |
| download | chromium_src-d90efd53258c1323a73c6326e2bbced20020b37d.zip chromium_src-d90efd53258c1323a73c6326e2bbced20020b37d.tar.gz chromium_src-d90efd53258c1323a73c6326e2bbced20020b37d.tar.bz2 | |
Build fix for chromeos: MessagePumpAuraX11's header should forward declare glib
MessagePumpAuraX11's implementation can still depend on it, though.
BUG=none
TEST=none
Review URL: https://chromiumcodereview.appspot.com/10693014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@144785 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
| -rw-r--r-- | base/message_pump_aurax11.cc | 3 | ||||
| -rw-r--r-- | base/message_pump_aurax11.h | 6 | ||||
| -rw-r--r-- | base/message_pump_glib_unittest.cc | 1 |
3 files changed, 6 insertions, 4 deletions
diff --git a/base/message_pump_aurax11.cc b/base/message_pump_aurax11.cc index 735a09c..3e21903 100644 --- a/base/message_pump_aurax11.cc +++ b/base/message_pump_aurax11.cc @@ -4,6 +4,7 @@ #include "base/message_pump_aurax11.h" +#include <glib.h> #include <X11/extensions/XInput2.h> #include "base/basictypes.h" @@ -112,7 +113,7 @@ void MessagePumpAuraX11::SetDefaultDispatcher( g_default_dispatcher = dispatcher; } -gboolean MessagePumpAuraX11::DispatchXEvents() { +bool MessagePumpAuraX11::DispatchXEvents() { Display* display = GetDefaultXDisplay(); DCHECK(display); MessagePumpDispatcher* dispatcher = diff --git a/base/message_pump_aurax11.h b/base/message_pump_aurax11.h index ba04275..1f86004 100644 --- a/base/message_pump_aurax11.h +++ b/base/message_pump_aurax11.h @@ -13,8 +13,8 @@ #include <bitset> -#include <glib.h> - +typedef struct _GPollFD GPollFD; +typedef struct _GSource GSource; typedef struct _XDisplay Display; namespace base { @@ -35,7 +35,7 @@ class BASE_EXPORT MessagePumpAuraX11 : public MessagePumpGlib { // Internal function. Called by the glib source dispatch function. Processes // all available X events. - gboolean DispatchXEvents(); + bool DispatchXEvents(); protected: virtual ~MessagePumpAuraX11(); diff --git a/base/message_pump_glib_unittest.cc b/base/message_pump_glib_unittest.cc index f3df012..feefe76 100644 --- a/base/message_pump_glib_unittest.cc +++ b/base/message_pump_glib_unittest.cc @@ -4,6 +4,7 @@ #include "base/message_pump_glib.h" +#include <glib.h> #include <math.h> #include <algorithm> |