Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(730)

Unified Diff: remoting/client/x11_view.cc

Issue 2788003: Enable chromoting in the build by default (Closed)
Patch Set: fixed mac Created 10 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/client/x11_view.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
« no previous file with comments | « remoting/client/x11_view.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698