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:
parent
0fc2f9f04a
commit
4aaad0bfbc
|
@ -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>
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -27,17 +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>
|
||||
|
@ -66,12 +55,6 @@
|
|||
#endif /* XF86DRI */
|
||||
#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 {
|
||||
Window win;
|
||||
Window win_pre_existing; /* Set via -parent option like xnest */
|
||||
|
|
Loading…
Reference in New Issue
Block a user