From 1a038249967b51878bc492df42e24b2af797bb85 Mon Sep 17 00:00:00 2001 From: marha Date: Fri, 21 May 2010 06:36:23 +0000 Subject: xserver git update 21/5/2010 --- xorg-server/include/gcstruct.h | 3 ++- xorg-server/include/scrnintstr.h | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'xorg-server/include') 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 -- cgit v1.2.3