diff options
| author | marha <marha@users.sourceforge.net> | 2010-10-19 21:03:53 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-10-19 21:03:53 +0000 |
| commit | be10ad8a9efe4131c14c2dde36adaf11e7b125aa (patch) | |
| tree | 0a0f9305b181d427c5581f7a072e69e52199bdbb /xorg-server/hw/xfree86/common/xf86Xinput.h | |
| parent | 2197318e5fc026ee57325ce953113d1963e7dc82 (diff) | |
| parent | 6ab3babba7b1b74528c2194a495fa1e2e67faa55 (diff) | |
| download | vcxsrv-be10ad8a9efe4131c14c2dde36adaf11e7b125aa.tar.gz vcxsrv-be10ad8a9efe4131c14c2dde36adaf11e7b125aa.tar.bz2 vcxsrv-be10ad8a9efe4131c14c2dde36adaf11e7b125aa.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/hw/xfree86/common/xf86Xinput.h')
| -rw-r--r-- | xorg-server/hw/xfree86/common/xf86Xinput.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xorg-server/hw/xfree86/common/xf86Xinput.h b/xorg-server/hw/xfree86/common/xf86Xinput.h index 1e5671574..727f26107 100644 --- a/xorg-server/hw/xfree86/common/xf86Xinput.h +++ b/xorg-server/hw/xfree86/common/xf86Xinput.h @@ -184,7 +184,7 @@ extern _X_EXPORT void xf86PostKeyboardEvent(DeviceIntPtr device, unsigned int ke int is_down);
extern _X_EXPORT int xf86ActivateDevice(LocalDevicePtr local);
extern _X_EXPORT LocalDevicePtr xf86FirstLocalDevice(void);
-extern _X_EXPORT int xf86ScaleAxis(int Cx, int Sxhigh, int Sxlow, int Rxhigh, int Rxlow);
+extern _X_EXPORT int xf86ScaleAxis(int Cx, int to_max, int to_min, int from_max, int from_min);
extern _X_EXPORT void xf86XInputSetScreen(LocalDevicePtr local, int screen_number, int x, int y);
extern _X_EXPORT void xf86ProcessCommonOptions(InputInfoPtr pInfo, pointer options);
extern _X_EXPORT void xf86InitValuatorAxisStruct(DeviceIntPtr dev, int axnum, Atom label, int minval,
|