| Index: remoting/client/x11_view.cc
|
| diff --git a/remoting/client/x11_view.cc b/remoting/client/x11_view.cc
|
| index bdb54d42fec8988b4f260fb0eabda40f006aed7a..d1a7eb526b4197304ace2b716d244036ffd26116 100644
|
| --- a/remoting/client/x11_view.cc
|
| +++ b/remoting/client/x11_view.cc
|
| @@ -4,15 +4,23 @@
|
|
|
| #include "remoting/client/x11_view.h"
|
|
|
| +// Cursor defined in Quickdraw.h on mac conflicts with X.h.
|
| +#if defined(OS_MAC)
|
| +#define Cursor X11_Cursor
|
| +#endif
|
| #include <X11/Xlib.h>
|
| #include <X11/Xutil.h>
|
| #include <X11/extensions/Xrender.h>
|
| #include <X11/extensions/Xcomposite.h>
|
| +#if defined(OS_MAC)
|
| +#undef Cursor
|
| +#endif
|
| +
|
| #include "remoting/client/decoder_verbatim.h"
|
|
|
| namespace remoting {
|
|
|
| -X11View::X11View(Display* display, int window, int width, int height)
|
| +X11View::X11View(Display* display, XID window, int width, int height)
|
| : display_(display),
|
| window_(window),
|
| picture_(0),
|
| @@ -60,7 +68,7 @@ void X11View::Paint() {
|
| XFreeGC(display_, gc);
|
|
|
| // Creates the picture representing the pixmap.
|
| - unsigned long picture = XRenderCreatePicture(
|
| + XID picture = XRenderCreatePicture(
|
| display_, pixmap,
|
| XRenderFindStandardFormat(display_, PictStandardARGB32),
|
| 0, NULL);
|
|
|