From 7c2f0a8befb310707ea923dbcdfde84521e52c88 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri, 15 Feb 2008 19:17:40 -0500
Subject: [PATCH] Remove COMPOSITE ifdefs around WindowRec bitfield as it has
 no ABI effect.

---
 dix/window.c        | 2 --
 include/windowstr.h | 4 +---
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/dix/window.c b/dix/window.c
index b896ef742..70e32fbcf 100644
--- a/dix/window.c
+++ b/dix/window.c
@@ -290,9 +290,7 @@ SetWindowToDefaults(WindowPtr pWin)
     pWin->deliverableEvents = 0;
     pWin->dontPropagate = 0;
     pWin->forcedBS = FALSE;
-#ifdef COMPOSITE
     pWin->redirectDraw = RedirectDrawNone;
-#endif
 }
 
 static void
diff --git a/include/windowstr.h b/include/windowstr.h
index 4359481cd..a16132458 100644
--- a/include/windowstr.h
+++ b/include/windowstr.h
@@ -158,9 +158,7 @@ typedef struct _Window {
     unsigned		viewable:1;	/* realized && InputOutput */
     unsigned		dontPropagate:3;/* index into DontPropagateMasks */
     unsigned		forcedBS:1;	/* system-supplied backingStore */
-#ifdef COMPOSITE
-    unsigned		redirectDraw:2;	/* rendering is redirected from here */
-#endif
+    unsigned		redirectDraw:2;	/* COMPOSITE rendering redirect */
 } WindowRec;
 
 /*