summaryrefslogtreecommitdiff
path: root/src/emumb.c
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu.herrb@laas.fr>2011-07-17 15:15:22 +0200
committerMatthieu Herrb <matthieu.herrb@laas.fr>2011-07-17 15:15:22 +0200
commit9e3ca8a898b16acf28fbf405902807e37cd22abd (patch)
tree7697d80d0449fc47a074efb251e1ecc3533fc98b /src/emumb.c
parentcce0013cd1a2fc107b868e34f32b5490e88be382 (diff)
Unifdef support for xinput ABI up to 10.HEADmaster
Diffstat (limited to 'src/emumb.c')
-rw-r--r--src/emumb.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/emumb.c b/src/emumb.c
index 7cd9ec8..c9f6b0c 100644
--- a/src/emumb.c
+++ b/src/emumb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD$ */
+/* $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>
@@ -36,6 +36,7 @@
#include "config.h"
#endif
+#include <xorg-server.h>
#include <X11/Xatom.h>
#include <xf86.h>
#include <xf86_OSproc.h>
@@ -53,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:
*
@@ -353,7 +353,6 @@ wsmbEmuEnable(InputInfoPtr pInfo, BOOL enable)
}
-#ifdef HAVE_PROPERTIES
static int
wsmbEmuSetProperty(DeviceIntPtr dev, Atom atom, XIPropertyValuePtr val,
BOOL checkonly)
@@ -424,4 +423,3 @@ wsmbEmuInitProperty(DeviceIntPtr dev)
XIRegisterPropertyHandler(dev, wsmbEmuSetProperty, NULL, NULL);
}
-#endif