summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2012-07-30 15:56:18 -0700
committerPeter Hutterer <peter.hutterer@who-t.net>2012-07-31 09:37:58 +1000
commit5a5f41659d4e43330407fa8895710c865d2b5328 (patch)
tree63d56f52a73f4e0b3169bafe3c0f914829c0e1a3
parent5748979008acafd1a8b28f47e292ed6a9706474c (diff)
downloadxorg-driver-xf86-input-mouse-5a5f41659d4e43330407fa8895710c865d2b5328.tar.gz
Fix compiler warning in sun_mouse.c (Solaris-only)
sun_mouse.c: In function 'vuidRemoveMouse': sun_mouse.c:150:42: warning: declaration of 'time' shadows a global declaration Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--src/sun_mouse.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/sun_mouse.c b/src/sun_mouse.c
index db1a4ae..a291c19 100644
--- a/src/sun_mouse.c
+++ b/src/sun_mouse.c
@@ -147,7 +147,7 @@ VuidMsePtr getVuidMsePriv(InputInfoPtr pInfo)
list or changing pInfo->fd while xf86Wakeup is looping through the list
causes server crashes */
static CARD32
-vuidRemoveMouse(OsTimerPtr timer, CARD32 time, pointer arg)
+vuidRemoveMouse(OsTimerPtr timer, CARD32 now, pointer arg)
{
InputInfoPtr pInfo = (InputInfoPtr) arg;