Module Name: xsrc
Committed By: christos
Date: Mon May 23 19:46:41 UTC 2011
Modified Files:
xsrc/xfree/xc/programs/Xserver/hw/netbsd/mac68k: mac68k.h mac68kMouse.c
Log Message:
change prototype to avoid casts.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/mac68k/mac68k.h
cvs rdiff -u -r1.1 -r1.2 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/mac68k/mac68kMouse.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/mac68k/mac68k.h
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/mac68k/mac68k.h:1.6 xsrc/xfree/xc/programs/Xserver/hw/netbsd/mac68k/mac68k.h:1.7
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/mac68k/mac68k.h:1.6 Sun May 22 22:40:13 2011
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/mac68k/mac68k.h Mon May 23 15:46:41 2011
@@ -94,7 +94,7 @@
void mac68k_processkbd(DeviceIntPtr, adb_event_t *);
-void mac68k_processmouse(DevicePtr, adb_event_t *);
+void mac68k_processmouse(DeviceIntPtr, adb_event_t *);
void mac68k_getmouse(void);
void mac68k_getkbd(void);
Bool mac68k_screeninit(ScreenPtr);
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/mac68k/mac68kMouse.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/mac68k/mac68kMouse.c:1.1 xsrc/xfree/xc/programs/Xserver/hw/netbsd/mac68k/mac68kMouse.c:1.2
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/mac68k/mac68kMouse.c:1.1 Fri Jan 9 22:02:43 2004
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/mac68k/mac68kMouse.c Mon May 23 15:46:41 2011
@@ -143,14 +143,14 @@
static int accel_mouse (
- DevicePtr mouse,
+ DeviceIntPtr mouse,
int delta)
{
register int sgn = sign(delta);
register PtrCtrl *ctrlptr;
delta = abs(delta);
- ctrlptr = &((DeviceIntPtr) mouse)->ptrfeed->ctrl;
+ ctrlptr = &mouse->ptrfeed->ctrl;
if (delta > ctrlptr->threshold)
return (sgn * (ctrlptr->threshold + ((delta - ctrlptr->threshold) *
@@ -161,7 +161,7 @@
void mac68k_processmouse(
- DevicePtr mouse,
+ DeviceIntPtr mouse,
adb_event_t *event)
{
xEvent xev;
