diff options
| author | marha <marha@users.sourceforge.net> | 2010-05-21 06:36:23 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-05-21 06:36:23 +0000 |
| commit | 1a038249967b51878bc492df42e24b2af797bb85 (patch) | |
| tree | fb2dcd26819ab0ac4e3d3aa4b5a8a3d8e339b9c6 /xorg-server/include | |
| parent | 3319741e6f9fc3232eb40462a261271b9af2dcb2 (diff) | |
| download | vcxsrv-1a038249967b51878bc492df42e24b2af797bb85.tar.gz vcxsrv-1a038249967b51878bc492df42e24b2af797bb85.tar.bz2 vcxsrv-1a038249967b51878bc492df42e24b2af797bb85.zip | |
xserver git update 21/5/2010
Diffstat (limited to 'xorg-server/include')
| -rw-r--r-- | xorg-server/include/gcstruct.h | 3 | ||||
| -rw-r--r-- | xorg-server/include/scrnintstr.h | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/xorg-server/include/gcstruct.h b/xorg-server/include/gcstruct.h index c56dd9294..c2f057a4a 100644 --- a/xorg-server/include/gcstruct.h +++ b/xorg-server/include/gcstruct.h @@ -292,7 +292,8 @@ typedef struct _GC { unsigned int tileIsPixel:1; /* tile is solid pixel */
unsigned int fExpose:1; /* Call exposure handling */
unsigned int freeCompClip:1; /* Free composite clip */
- unsigned int unused:14; /* see comment above */
+ unsigned int scratch_inuse:1; /* is this GC in a pool for reuse? */
+ unsigned int unused:13; /* see comment above */
unsigned long planemask;
unsigned long fgPixel;
unsigned long bgPixel;
diff --git a/xorg-server/include/scrnintstr.h b/xorg-server/include/scrnintstr.h index e07bee3c3..8684c8f19 100644 --- a/xorg-server/include/scrnintstr.h +++ b/xorg-server/include/scrnintstr.h @@ -455,7 +455,6 @@ typedef struct _Screen { short minInstalledCmaps, maxInstalledCmaps;
char backingStoreSupport, saveUnderSupport;
unsigned long whitePixel, blackPixel;
- unsigned long rgf; /* array of flags; she's -- HUNGARIAN */
GCPtr GCperDepth[MAXFORMATS+1];
/* next field is a stipple to use as default in
a GC. we don't build default tiles of all depths
|