diff options
| author | marha <marha@users.sourceforge.net> | 2010-05-05 09:43:03 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-05-05 09:43:03 +0000 |
| commit | 0874ae23a16946781dd517cfdb011c691ad0b581 (patch) | |
| tree | 8de31864935e96a5e59b9fe6ceb12390bbc474cd /xorg-server/include/inputstr.h | |
| parent | d059ebdcb012228102f0b64f8cddf9464d5b625a (diff) | |
| download | vcxsrv-0874ae23a16946781dd517cfdb011c691ad0b581.tar.gz vcxsrv-0874ae23a16946781dd517cfdb011c691ad0b581.tar.bz2 vcxsrv-0874ae23a16946781dd517cfdb011c691ad0b581.zip | |
svn merge -r571:HEAD "^/branches/released" .
Diffstat (limited to 'xorg-server/include/inputstr.h')
| -rw-r--r-- | xorg-server/include/inputstr.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/xorg-server/include/inputstr.h b/xorg-server/include/inputstr.h index de4026cb7..6da3f38e4 100644 --- a/xorg-server/include/inputstr.h +++ b/xorg-server/include/inputstr.h @@ -514,8 +514,9 @@ typedef struct _DeviceIntRec { LedFeedbackPtr leds; struct _XkbInterest *xkb_interest; char *config_info; /* used by the hotplug layer */ + ClassesPtr unused_classes; /* for master devices */ + int saved_master_id; /* for slaves while grabbed */ PrivateRec *devPrivates; - int nPrivates; DeviceUnwrapProc unwrapProc; SpriteInfoPtr spriteInfo; union { |