From dbed6d43bdb630245a6c864a08976f6a5b4e7cd5 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 10 Dec 2008 09:22:33 +1000 Subject: [PATCH] Fix compilation issue (opts undeclared) for XINPUT ABI 0. (#18988) HistorySize is now deprecated for ABI > 0, so list it as a removed option in the man page. X.Org Bug 18988 Signed-off-by: Peter Hutterer --- man/synaptics.man | 2 ++ src/synaptics.c | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/man/synaptics.man b/man/synaptics.man index 0030680..aaa448c 100644 --- a/man/synaptics.man +++ b/man/synaptics.man @@ -634,6 +634,8 @@ edge scrolling is enabled for both horizontal and vertical scrolling. The following options are no longer part of the driver configuration: .TP .BI "Option \*qRepeater\*q \*q" string \*q +.TP +.BI "Option \*qHistorySize\*q \*q" integer \*q .SH "AUTHORS" .LP diff --git a/src/synaptics.c b/src/synaptics.c index 8ccfb69..664d2fa 100644 --- a/src/synaptics.c +++ b/src/synaptics.c @@ -595,7 +595,7 @@ SynapticsPreInit(InputDriverPtr drv, IDevPtr dev, int flags) } #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0 - local->history_size = xf86SetIntOption(opts, "HistorySize", 0); + local->history_size = xf86SetIntOption(local->options, "HistorySize", 0); #endif xf86ProcessCommonOptions(local, local->options); -- 1.6.0.4