From edbc56c088462844f6445f5e6d7cbcfc58a207dc Mon Sep 17 00:00:00 2001
From: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Mon, 26 Apr 2010 14:49:25 +0300
Subject: [PATCH] include: remove couple of unused structures fields and bump
 ABI

Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
---
 hw/xfree86/common/xf86Module.h | 6 +++---
 include/dixstruct.h            | 4 ----
 include/scrnintstr.h           | 2 --
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/hw/xfree86/common/xf86Module.h b/hw/xfree86/common/xf86Module.h
index bbf5786c9..d61758f78 100644
--- a/hw/xfree86/common/xf86Module.h
+++ b/hw/xfree86/common/xf86Module.h
@@ -82,9 +82,9 @@ typedef enum {
  * mask is 0xFFFF0000.
  */
 #define ABI_ANSIC_VERSION	SET_ABI_VERSION(0, 4)
-#define ABI_VIDEODRV_VERSION	SET_ABI_VERSION(7, 0)
-#define ABI_XINPUT_VERSION	SET_ABI_VERSION(9, 0)
-#define ABI_EXTENSION_VERSION	SET_ABI_VERSION(3, 0)
+#define ABI_VIDEODRV_VERSION	SET_ABI_VERSION(8, 0)
+#define ABI_XINPUT_VERSION	SET_ABI_VERSION(10, 0)
+#define ABI_EXTENSION_VERSION	SET_ABI_VERSION(4, 0)
 #define ABI_FONT_VERSION	SET_ABI_VERSION(0, 6)
 
 #define MODINFOSTRING1	0xef23fdc5
diff --git a/include/dixstruct.h b/include/dixstruct.h
index 696b793ff..5b1a6981d 100644
--- a/include/dixstruct.h
+++ b/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;
diff --git a/include/scrnintstr.h b/include/scrnintstr.h
index 5a7c57d83..553893677 100644
--- a/include/scrnintstr.h
+++ b/include/scrnintstr.h
@@ -615,10 +615,8 @@ typedef struct _ScreenInfo {
     int		numPixmapFormats;
     PixmapFormatRec
 		formats[MAXFORMATS];
-    int		unused2;
     int		numScreens;
     ScreenPtr	screens[MAXSCREENS];
-    int		unused;
 } ScreenInfo;
 
 extern _X_EXPORT ScreenInfo screenInfo;