andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

inputstr: try to keep device structs the same size

Browse Source 
Try to make sure DeviceIntRec and friends stay the same size,
regardless of whether or not XKB is enabled.
This commit is contained in:
Daniel Stone 2006-10-24 23:06:57 +03:00 committed by Daniel Stone
parent 9f9ac01a81
commit 37d1fffe79
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/inputstr.h
View File

@ -131,6 +131,8 @@ typedef struct _KeyClassRec {
unsigned short prev_state;
#ifdef XKB
struct _XkbSrvInfo *xkbInfo;
#else
void *pad0;
#endif
} KeyClassRec, *KeyClassPtr;
@ -163,7 +165,9 @@ typedef struct _ButtonClassRec {
CARD8 down[DOWN_LENGTH];
CARD8 map[MAP_LENGTH];
#ifdef XKB
union _XkbAction * xkb_acts;
union _XkbAction *xkb_acts;
#else
void *pad0;
#endif
} ButtonClassRec, *ButtonClassPtr;
@ -214,6 +218,8 @@ typedef struct _KbdFeedbackClassRec {
KbdFeedbackPtr next;
#ifdef XKB
struct _XkbSrvLedInfo *xkb_sli;
#else
void *pad0;
#endif
} KbdFeedbackClassRec;
@ -248,6 +254,8 @@ typedef struct _LedFeedbackClassRec {
LedFeedbackPtr next;
#ifdef XKB
struct _XkbSrvLedInfo *xkb_sli;
#else
void *pad0;
#endif
} LedFeedbackClassRec;
@ -309,7 +317,9 @@ typedef struct _DeviceIntRec {
BellFeedbackPtr bell;
LedFeedbackPtr leds;
#ifdef XKB
struct _XkbInterest * xkb_interest;
struct _XkbInterest *xkb_interest;
#else
void *pad0;
#endif
DevUnion *devPrivates;
int nPrivates;