diff options
| author | Adam Jackson <ajax@redhat.com> | 2012-10-18 14:24:20 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2013-09-10 13:28:24 -0400 |
| commit | abbd85742a390e18497b96902a0c0d976739e3bd (patch) | |
| tree | cf480cccb1ff075810d0d73c36b05a2099ae7fc8 /dix | |
| parent | dff81687f5eac3eac9b49f58d4654cc30add2547 (diff) | |
dix: FIXES is not optional
It's already not optional at configure time, this just makes it so at
build time too.
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Diffstat (limited to 'dix')
| -rw-r--r-- | dix/cursor.c | 6 | ||||
| -rw-r--r-- | dix/window.c | 6 |
2 files changed, 0 insertions, 12 deletions
diff --git a/dix/cursor.c b/dix/cursor.c index cd8305c6c..8cc54bd1f 100644 --- a/dix/cursor.c +++ b/dix/cursor.c @@ -71,9 +71,7 @@ static GlyphSharePtr sharedGlyphs = (GlyphSharePtr) NULL; DevScreenPrivateKeyRec cursorScreenDevPriv; -#ifdef XFIXES static CARD32 cursorSerial; -#endif static void FreeCursorBits(CursorBitsPtr bits) @@ -272,10 +270,8 @@ AllocARGBCursor(unsigned char *psrcbits, unsigned char *pmaskbits, bits->refcnt = -1; CheckForEmptyMask(bits); pCurs->bits = bits; -#ifdef XFIXES pCurs->serialNumber = ++cursorSerial; pCurs->name = None; -#endif pCurs->foreRed = foreRed; pCurs->foreGreen = foreGreen; @@ -433,10 +429,8 @@ AllocGlyphCursor(Font source, unsigned sourceChar, Font mask, unsigned maskChar, CheckForEmptyMask(bits); pCurs->bits = bits; pCurs->refcnt = 1; -#ifdef XFIXES pCurs->serialNumber = ++cursorSerial; pCurs->name = None; -#endif pCurs->foreRed = foreRed; pCurs->foreGreen = foreGreen; diff --git a/dix/window.c b/dix/window.c index 9fa51c288..cff341b65 100644 --- a/dix/window.c +++ b/dix/window.c @@ -2847,11 +2847,9 @@ HandleSaveSet(ClientPtr client) for (j = 0; j < client->numSaved; j++) { pWin = SaveSetWindow(client->saveSet[j]); -#ifdef XFIXES if (SaveSetToRoot(client->saveSet[j])) pParent = pWin->drawable.pScreen->root; else -#endif { pParent = pWin->parent; while (pParent && (wClient(pParent) == client)) @@ -2859,11 +2857,9 @@ HandleSaveSet(ClientPtr client) } if (pParent) { if (pParent != pWin->parent) { -#ifdef XFIXES /* unmap first so that ReparentWindow doesn't remap */ if (!SaveSetShouldMap(client->saveSet[j])) UnmapWindow(pWin, FALSE); -#endif ReparentWindow(pWin, pParent, pWin->drawable.x - wBorderWidth(pWin) - pParent->drawable.x, @@ -2872,9 +2868,7 @@ HandleSaveSet(ClientPtr client) if (!pWin->realized && pWin->mapped) pWin->mapped = FALSE; } -#ifdef XFIXES if (SaveSetShouldMap(client->saveSet[j])) -#endif MapWindow(pWin, client); } } |