[PATCH synaptics] Fix build on BSD

Julien Cristau jcristau at debian.org
Fri Feb 25 11:41:12 PST 2011


local was renamed to pInfo in 81ad2e389d11691d5c2687d83150e8e9033cfe76,
but a couple places were missed.

Signed-off-by: Julien Cristau <jcristau at debian.org>
---
 src/psmcomm.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Failed build log at
https://buildd.debian.org/fetch.cgi?pkg=xserver-xorg-input-synaptics&arch=kfreebsd-i386&ver=1.3.99.901-1&stamp=1298259815&file=log&as=raw

diff --git a/src/psmcomm.c b/src/psmcomm.c
index 66e8d1e..741cd1d 100644
--- a/src/psmcomm.c
+++ b/src/psmcomm.c
@@ -147,7 +147,7 @@ PSMQueryHardware(InputInfoPtr pInfo)
     synhw = (struct SynapticsHwInfo*)priv->proto_data;
 
     /* is the synaptics touchpad active? */
-    if (!PSMQueryIsSynaptics(local))
+    if (!PSMQueryIsSynaptics(pInfo))
 	return FALSE;
 
     xf86Msg(X_PROBED, "%s synaptics touchpad found\n", pInfo->name);
@@ -167,7 +167,7 @@ PSMReadHwState(InputInfoPtr pInfo,
 	       struct SynapticsProtocolOperations *proto_ops,
 	       struct CommData *comm, struct SynapticsHwState *hwRet)
 {
-    return psaux_proto_operations.ReadHwState(local, proto_ops, comm, hwRet);
+    return psaux_proto_operations.ReadHwState(pInfo, proto_ops, comm, hwRet);
 }
 
 static Bool PSMAutoDevProbe(InputInfoPtr pInfo)
-- 
1.7.2.3



More information about the xorg-devel mailing list