inputstr: try to keep device structs the same size
Try to make sure DeviceIntRec and friends stay the same size, regardless of whether or not XKB is enabled.
This commit is contained in:
parent
9f9ac01a81
commit
37d1fffe79
|
@ -131,6 +131,8 @@ typedef struct _KeyClassRec {
|
||||||
unsigned short prev_state;
|
unsigned short prev_state;
|
||||||
#ifdef XKB
|
#ifdef XKB
|
||||||
struct _XkbSrvInfo *xkbInfo;
|
struct _XkbSrvInfo *xkbInfo;
|
||||||
|
#else
|
||||||
|
void *pad0;
|
||||||
#endif
|
#endif
|
||||||
} KeyClassRec, *KeyClassPtr;
|
} KeyClassRec, *KeyClassPtr;
|
||||||
|
|
||||||
|
@ -164,6 +166,8 @@ typedef struct _ButtonClassRec {
|
||||||
CARD8 map[MAP_LENGTH];
|
CARD8 map[MAP_LENGTH];
|
||||||
#ifdef XKB
|
#ifdef XKB
|
||||||
union _XkbAction *xkb_acts;
|
union _XkbAction *xkb_acts;
|
||||||
|
#else
|
||||||
|
void *pad0;
|
||||||
#endif
|
#endif
|
||||||
} ButtonClassRec, *ButtonClassPtr;
|
} ButtonClassRec, *ButtonClassPtr;
|
||||||
|
|
||||||
|
@ -214,6 +218,8 @@ typedef struct _KbdFeedbackClassRec {
|
||||||
KbdFeedbackPtr next;
|
KbdFeedbackPtr next;
|
||||||
#ifdef XKB
|
#ifdef XKB
|
||||||
struct _XkbSrvLedInfo *xkb_sli;
|
struct _XkbSrvLedInfo *xkb_sli;
|
||||||
|
#else
|
||||||
|
void *pad0;
|
||||||
#endif
|
#endif
|
||||||
} KbdFeedbackClassRec;
|
} KbdFeedbackClassRec;
|
||||||
|
|
||||||
|
@ -248,6 +254,8 @@ typedef struct _LedFeedbackClassRec {
|
||||||
LedFeedbackPtr next;
|
LedFeedbackPtr next;
|
||||||
#ifdef XKB
|
#ifdef XKB
|
||||||
struct _XkbSrvLedInfo *xkb_sli;
|
struct _XkbSrvLedInfo *xkb_sli;
|
||||||
|
#else
|
||||||
|
void *pad0;
|
||||||
#endif
|
#endif
|
||||||
} LedFeedbackClassRec;
|
} LedFeedbackClassRec;
|
||||||
|
|
||||||
|
@ -310,6 +318,8 @@ typedef struct _DeviceIntRec {
|
||||||
LedFeedbackPtr leds;
|
LedFeedbackPtr leds;
|
||||||
#ifdef XKB
|
#ifdef XKB
|
||||||
struct _XkbInterest *xkb_interest;
|
struct _XkbInterest *xkb_interest;
|
||||||
|
#else
|
||||||
|
void *pad0;
|
||||||
#endif
|
#endif
|
||||||
DevUnion *devPrivates;
|
DevUnion *devPrivates;
|
||||||
int nPrivates;
|
int nPrivates;
|
||||||
|
|
Loading…
Reference in New Issue