diff options
| author | Julien Cristau <jcristau@debian.org> | 2010-10-20 20:10:43 +0200 |
|---|---|---|
| committer | Julien Cristau <jcristau@debian.org> | 2010-10-20 21:42:52 +0200 |
| commit | 08fe03226c3b5dcd3794755fa12b4aed398158e0 (patch) | |
| tree | 38860e97609782de07e1949d671cef3844d417e5 | |
| parent | 012b27fef6349d03b3c239edf801b71c6cd35791 (diff) | |
Xephyr: we're not using Xlib anymore, no need to undef _XSERVER64xephyr-xcb
Drop obsolete comments about interaction between Xlib code and that
macro, and stop undefining it.
Signed-off-by: Julien Cristau <jcristau@debian.org>
| -rw-r--r-- | hw/kdrive/ephyr/ephyrhostglx.c | 11 | ||||
| -rw-r--r-- | hw/kdrive/ephyr/ephyrhostvideo.c | 10 | ||||
| -rw-r--r-- | hw/kdrive/ephyr/hostx.c | 18 |
3 files changed, 0 insertions, 39 deletions
diff --git a/hw/kdrive/ephyr/ephyrhostglx.c b/hw/kdrive/ephyr/ephyrhostglx.c index 2dc578b99..ecfcb59b8 100644 --- a/hw/kdrive/ephyr/ephyrhostglx.c +++ b/hw/kdrive/ephyr/ephyrhostglx.c @@ -31,17 +31,6 @@ #include <kdrive-config.h> #endif -/* - * including some server headers (like kdrive-config.h) - * might define the macro _XSERVER64 - * on 64 bits machines. That macro must _NOT_ be defined for Xlib - * client code, otherwise bad things happen. - * So let's undef that macro if necessary. - */ -#ifdef _XSERVER64 -#undef _XSERVER64 -#endif - #include <X11/Xdefs.h> #include <X11/Xmd.h> #include <GL/glxproto.h> diff --git a/hw/kdrive/ephyr/ephyrhostvideo.c b/hw/kdrive/ephyr/ephyrhostvideo.c index 945cb9e1a..2cf5caea1 100644 --- a/hw/kdrive/ephyr/ephyrhostvideo.c +++ b/hw/kdrive/ephyr/ephyrhostvideo.c @@ -28,16 +28,6 @@ #ifdef HAVE_CONFIG_H #include <kdrive-config.h> #endif -/* - * including some server headers (like kdrive-config.h) - * might define the macro _XSERVER64 - * on 64 bits machines. That macro must _NOT_ be defined for Xlib - * client code, otherwise bad things happen. - * So let's undef that macro if necessary. - */ -#ifdef _XSERVER64 -#undef _XSERVER64 -#endif #include <xcb/xv.h> #include <xcb/xcb_aux.h> #define _HAVE_XALLOC_DECLS diff --git a/hw/kdrive/ephyr/hostx.c b/hw/kdrive/ephyr/hostx.c index 55daa150d..14a8a6480 100644 --- a/hw/kdrive/ephyr/hostx.c +++ b/hw/kdrive/ephyr/hostx.c @@ -27,18 +27,6 @@ #include <kdrive-config.h> #endif -/* - * including some server headers (like kdrive-config.h) - * might define the macro _XSERVER64 - * on 64 bits machines. That macro must _NOT_ be defined for Xlib - * client code, otherwise bad things happen. - * So let's undef that macro if necessary. - */ -#ifdef _XSERVER64 -#undef _XSERVER64 -#endif - - #include "hostx.h" #include <stdlib.h> @@ -72,12 +60,6 @@ #define False 0 #endif -/* - * All xlib calls go here, which gets built as its own .a . - * Mixing kdrive and xlib headers causes all sorts of types - * to get clobbered. - */ - struct EphyrHostScreen { Window win; |