diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2010-11-11 12:54:46 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2010-11-11 12:54:46 +1000 |
| commit | 88cb61e1e55c54982b90e2a77465faaac6a0ba89 (patch) | |
| tree | 0798bc507e7b088e2bdeadd29888a4bd092b036d /include | |
| parent | 19f43836d1006d253391926e880b14ed2e7a0cf8 (diff) | |
| parent | 4ed4915bc0fbe9b4419ca4a0d4e43c2fee032ae9 (diff) | |
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-api
Conflicts:
dix/getevents.c
hw/xfree86/common/xf86Xinput.h
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/eventstr.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/eventstr.h b/include/eventstr.h index 433227e6e..377cceba2 100644 --- a/include/eventstr.h +++ b/include/eventstr.h @@ -99,7 +99,7 @@ struct _DeviceEvent struct { uint8_t mask[(MAX_VALUATORS + 7)/8]; /**< Valuator mask */ uint8_t mode[(MAX_VALUATORS + 7)/8]; /**< Valuator mode (Abs or Rel)*/ - uint32_t data[MAX_VALUATORS]; /**< Valuator data */ + int32_t data[MAX_VALUATORS]; /**< Valuator data */ int32_t data_frac[MAX_VALUATORS]; /**< Fractional part for data */ } valuators; struct { |