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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: remoting/client/x11_client.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/chromoting.gyp ('k') | remoting/client/x11_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/client/x11_client.cc
diff --git a/remoting/client/x11_client.cc b/remoting/client/x11_client.cc
index 6b8e4e2d3ee3a6ba54fe4f3d0cd389d33d53c981..f383af4eb9fe7230042fd8e739b284dbdeffd704 100644
--- a/remoting/client/x11_client.cc
+++ b/remoting/client/x11_client.cc
@@ -17,7 +17,15 @@
// x11_view.h also includes Xlib.h so put it behind all other headers but
// before Xlib.h
#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>
+#if defined(OS_MAC)
+#undef Cursor
+#endif
namespace remoting {
« no previous file with comments | « remoting/chromoting.gyp ('k') | remoting/client/x11_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698