diff options
| author | marha <marha@users.sourceforge.net> | 2010-05-22 13:29:08 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-05-22 13:29:08 +0000 |
| commit | 8b1228fdd95f63ae5ed6f80597eafc973fc5bf57 (patch) | |
| tree | acc77d1da984ddb537e44e57d1741560cf0b058b /xorg-server/include | |
| parent | f5fb2d27f1fd4976f0e77d97461a5e57ba6c9a23 (diff) | |
| parent | 1a038249967b51878bc492df42e24b2af797bb85 (diff) | |
| download | vcxsrv-8b1228fdd95f63ae5ed6f80597eafc973fc5bf57.tar.gz vcxsrv-8b1228fdd95f63ae5ed6f80597eafc973fc5bf57.tar.bz2 vcxsrv-8b1228fdd95f63ae5ed6f80597eafc973fc5bf57.zip | |
svn merge ^/branches/released .
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 d0ac0bb3b..705dff3ec 100644 --- a/xorg-server/include/scrnintstr.h +++ b/xorg-server/include/scrnintstr.h @@ -459,7 +459,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
|