undef unwanted X11 macros

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21547 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/qt4/GuiApplication.cpp b/src/frontends/qt4/GuiApplication.cpp
index cc67ead081faa96fac57e7f78b0efc94db9bd64a..5404d6d453376e920d90b1cadca008ce073e27ad 100644 (file)
--- a/src/frontends/qt4/GuiApplication.cpp
+++ b/src/frontends/qt4/GuiApplication.cpp
@@ -54,6 +54,8 @@
 #ifdef Q_WS_X11
 #include <X11/Xatom.h>
 #include <X11/Xlib.h>
+#undef CursorShape
+#undef None
 #endif
 
 #include <boost/bind.hpp>