svn merge ^/branches/released .

1 files changed, 2 insertions, 23 deletions

diff --git a/xorg-server/include/inputstr.h b/xorg-server/include/inputstr.h
index 02c30d33e..4016524d2 100644
--- a/xorg-server/include/inputstr.h
+++ b/xorg-server/include/inputstr.h
@@ -317,27 +317,6 @@ typedef struct _ProximityClassRec {
     char	in_proximity;

 } ProximityClassRec, *ProximityClassPtr;

 

-typedef struct _AbsoluteClassRec {

-    int         sourceid;

-    /* Calibration. */

-    int         min_x;

-    int         max_x;

-    int         min_y;

-    int         max_y;

-    int         flip_x;

-    int         flip_y;

-    int		rotation;

-    int         button_threshold;

-

-    /* Area. */

-    int         offset_x;

-    int         offset_y;

-    int         width;

-    int         height;

-    int         screen;

-    XID		following;

-} AbsoluteClassRec, *AbsoluteClassPtr;

-

 typedef struct _KbdFeedbackClassRec *KbdFeedbackPtr;

 typedef struct _PtrFeedbackClassRec *PtrFeedbackPtr;

 typedef struct _IntegerFeedbackClassRec *IntegerFeedbackPtr;

@@ -392,7 +371,7 @@ typedef struct _ClassesRec {
     ButtonClassPtr	button;

     FocusClassPtr	focus;

     ProximityClassPtr	proximity;

-    AbsoluteClassPtr    absolute;

+    void*               _pad0; /* keep ABI during AbsoluteClass removal */

     KbdFeedbackPtr	kbdfeed;

     PtrFeedbackPtr	ptrfeed;

     IntegerFeedbackPtr	intfeed;

@@ -517,7 +496,7 @@ typedef struct _DeviceIntRec {
     ButtonClassPtr	button;

     FocusClassPtr	focus;

     ProximityClassPtr	proximity;

-    AbsoluteClassPtr    absolute;

+    void*               _pad0;          /* keep ABI, was pointer to abs class */

     KbdFeedbackPtr	kbdfeed;

     PtrFeedbackPtr	ptrfeed;

     IntegerFeedbackPtr	intfeed;