From 5867d453cebebec6b4f10409af86b603755fbf51 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Thu, 12 Jan 2012 12:09:34 -0800
Subject: [PATCH] Revert "dix: Fix types in WindowOptRec"

This reverts commit a4553019a10b4e01cc06f3081db71a83338697b4.

ABI change pended for 1.13
---
 include/windowstr.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/windowstr.h b/include/windowstr.h
index 1124dfc4c..222de31dc 100644
--- a/include/windowstr.h
+++ b/include/windowstr.h
@@ -87,8 +87,8 @@ typedef struct _WindowOpt {
     struct _OtherClients *otherClients;	   /* default: NULL */
     struct _GrabRec	*passiveGrabs;	   /* default: NULL */
     PropertyPtr		userProps;	   /* default: NULL */
-    CARD32		backingBitPlanes;  /* default: ~0L */
-    CARD32		backingPixel;	   /* default: 0 */
+    unsigned long	backingBitPlanes;  /* default: ~0L */
+    unsigned long	backingPixel;	   /* default: 0 */
     RegionPtr		boundingShape;	   /* default: NULL */
     RegionPtr		clipShape;	   /* default: NULL */
     RegionPtr		inputShape;	   /* default: NULL */