diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2011-07-17 13:08:39 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2011-07-17 13:08:39 +0000 |
| commit | 7f5d549c394a406152e3120d9a3724064feacb30 (patch) | |
| tree | 51f69d3037c257e52abf6adcf440623404bfe611 /driver/xf86-input-ws/src/emumb.c | |
| parent | 095ed1566d8b6cc38e03aae5a10967720120b043 (diff) | |
Unifdef support for xinput ABI up to 10.
Diffstat (limited to 'driver/xf86-input-ws/src/emumb.c')
| -rw-r--r-- | driver/xf86-input-ws/src/emumb.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/driver/xf86-input-ws/src/emumb.c b/driver/xf86-input-ws/src/emumb.c index a105dedac..c9f6b0c59 100644 --- a/driver/xf86-input-ws/src/emumb.c +++ b/driver/xf86-input-ws/src/emumb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: emumb.c,v 1.4 2011/05/08 10:38:13 matthieu Exp $ */ +/* $OpenBSD: emumb.c,v 1.5 2011/07/17 13:08:38 matthieu Exp $ */ /* * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany. * Copyright 1993 by David Dawes <dawes@xfree86.org> @@ -54,10 +54,9 @@ enum { MBEMU_AUTO }; -#ifdef HAVE_PROPERTIES static Atom prop_mbemu = 0; /* Middle button emulation on/off property */ static Atom prop_mbtimeout = 0; /* Middle button timeout property */ -#endif + /* * Lets create a simple finite-state machine for 3 button emulation: * @@ -354,7 +353,6 @@ wsmbEmuEnable(InputInfoPtr pInfo, BOOL enable) } -#ifdef HAVE_PROPERTIES static int wsmbEmuSetProperty(DeviceIntPtr dev, Atom atom, XIPropertyValuePtr val, BOOL checkonly) @@ -425,4 +423,3 @@ wsmbEmuInitProperty(DeviceIntPtr dev) XIRegisterPropertyHandler(dev, wsmbEmuSetProperty, NULL, NULL); } -#endif |