From 0874ae23a16946781dd517cfdb011c691ad0b581 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Wed, 5 May 2010 09:43:03 +0000
Subject: svn merge -r571:HEAD "^/branches/released" .

---
 xorg-server/include/dixstruct.h | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'xorg-server/include/dixstruct.h')

diff --git a/xorg-server/include/dixstruct.h b/xorg-server/include/dixstruct.h
index acfbe46ca..9cd965445 100644
--- a/xorg-server/include/dixstruct.h
+++ b/xorg-server/include/dixstruct.h
@@ -85,7 +85,6 @@ typedef struct _Window *SaveSetElt;
 #define SaveSetAssignMap(ss,m)
 #endif
 
-/* The unused_ members are ABI spacing.  Please reuse them. */
 typedef struct _Client {
     int         index;
     Mask        clientAsMask;
@@ -101,7 +100,6 @@ typedef struct _Client {
 					 * killed */
     SaveSetElt	*saveSet;
     int         numSaved;
-    void	*unused_screenPrivate[16];
     int         (**requestVector) (
 		ClientPtr /* pClient */);
     CARD32	req_len;		/* length of current request */
@@ -116,8 +114,6 @@ typedef struct _Client {
     KeyCode		minKC,maxKC;
 
     unsigned long replyBytesRemaining;
-    void *unused_appgroup;
-    void *unused_fontResFunc;
     int	    smart_priority;
     long    smart_start_tick;
     long    smart_stop_tick;
-- 
cgit v1.2.3