frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Xephyr: we're not using Xlib anymore, no need to undef _XSERVER64 

Drop obsolete comments about interaction between Xlib code and that
macro, and stop undefining it.

Signed-off-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
Julien Cristau 2010-10-20 20:10:43 +02:00 committed by Eric Anholt
parent 0fc2f9f04a
commit 4aaad0bfbc
3 changed files with 0 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hw/kdrive/ephyr/ephyrhostglx.c
View File

@ -31,17 +31,6 @@
#include <kdrive-config.h> #include <kdrive-config.h>
#endif #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/Xdefs.h>
#include <X11/Xmd.h> #include <X11/Xmd.h>
#include <GL/glxproto.h> #include <GL/glxproto.h>

10
hw/kdrive/ephyr/ephyrhostvideo.c
View File

@ -28,16 +28,6 @@
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include <kdrive-config.h> #include <kdrive-config.h>
#endif #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/xv.h>
#include <xcb/xcb_aux.h> #include <xcb/xcb_aux.h>
#define _HAVE_XALLOC_DECLS #define _HAVE_XALLOC_DECLS

17
hw/kdrive/ephyr/hostx.c
View File

@ -27,17 +27,6 @@
#include <kdrive-config.h> #include <kdrive-config.h>
#endif #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 "hostx.h"
#include <stdlib.h> #include <stdlib.h>
@ -66,12 +55,6 @@
#endif /* XF86DRI */ #endif /* XF86DRI */
#include "ephyrlog.h" #include "ephyrlog.h"
/*
* 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 { struct EphyrHostScreen {
Window win; Window win;
Window win_pre_existing; /* Set via -parent option like xnest */ Window win_pre_existing; /* Set via -parent option like xnest */