Don't #define disp - causes trouble.

SVN revision: 46741
This commit is contained in:
Kim Woelders 2010-03-01 20:53:14 +00:00
parent 3f8623cf06
commit c8fdebba89
2 changed files with 2 additions and 2 deletions

View File

@ -48,6 +48,7 @@
#define DEBUG_PIXMAP 0
EDisplay Dpy;
Display *disp;
#if USE_COMPOSITE
static Visual *argb_visual = NULL;

View File

@ -29,7 +29,6 @@
#include "xtypes.h"
typedef struct {
Display *disp;
char *name;
int screens;
int screen;
@ -45,8 +44,8 @@ typedef struct {
} EDisplay;
__EXPORT__ extern EDisplay Dpy;
__EXPORT__ extern Display *disp;
#define disp Dpy.disp
#define RROOT Dpy.rroot
#define VROOT Dpy.vroot