summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac2
-rw-r--r--src/jstk_axis.c12
2 files changed, 7 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac
index 3bf90ab..bba19ca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -50,3 +50,3 @@ XORG_DRIVER_CHECK_EXT(XKB, kbproto)
# Checks for pkg-config packages
-PKG_CHECK_MODULES(XORG, [xorg-server >= 1.9.99.2] xproto $REQUIRED_MODULES)
+PKG_CHECK_MODULES(XORG, [xorg-server >= 1.18.99.2] xproto $REQUIRED_MODULES)
diff --git a/src/jstk_axis.c b/src/jstk_axis.c
index 3f3da6c..2f9793b 100644
--- a/src/jstk_axis.c
+++ b/src/jstk_axis.c
@@ -61,3 +61,3 @@ jstkAxisTimer(OsTimerPtr timer,
- int sigstate, i;
+ int i;
int nexttimer;
@@ -68,3 +68,3 @@ jstkAxisTimer(OsTimerPtr timer,
- sigstate = xf86BlockSIGIO();
+ input_lock();
@@ -308,3 +308,3 @@ jstkAxisTimer(OsTimerPtr timer,
}
- xf86UnblockSIGIO (sigstate);
+ input_unlock();
return nexttimer;
@@ -466,3 +466,3 @@ jstkPWMAxisTimer(OsTimerPtr timer,
- int sigstate, i;
+ int i;
int nexttimer;
@@ -471,3 +471,3 @@ jstkPWMAxisTimer(OsTimerPtr timer,
- sigstate = xf86BlockSIGIO();
+ input_lock();
@@ -578,3 +578,3 @@ jstkPWMAxisTimer(OsTimerPtr timer,
- xf86UnblockSIGIO (sigstate);
+ input_unlock();
return nexttimer;