include: remove couple of unused structures fields and bump ABI

Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
This commit is contained in:
Tiago Vignatti 2010-04-26 14:49:25 +03:00
parent 4f8dc1109d
commit edbc56c088
3 changed files with 3 additions and 9 deletions

View File

@ -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

View File

@ -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;

View File

@ -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;